Unverified Commit a1e95232 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

f3d: 3.1.0 -> 3.2.0 (#423550)

parents d3776c39 55297676
Loading
Loading
Loading
Loading
+2 −18
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@

stdenv.mkDerivation rec {
  pname = "f3d";
  version = "3.1.0";
  version = "3.2.0";

  outputs = [ "out" ] ++ lib.optionals withManual [ "man" ];

@@ -33,25 +33,9 @@ stdenv.mkDerivation rec {
    owner = "f3d-app";
    repo = "f3d";
    tag = "v${version}";
    hash = "sha256-QJQlZXUZyWhpYteHoIsGOj1jdf3Lpy/BMXopeto4IRo=";
    hash = "sha256-p1Cqam3sYDXJCU1A2sC/fV1ohxS3FGiVrxeGooNXVBQ=";
  };

  patches = [
    # https://github.com/f3d-app/f3d/pull/2155
    (fetchpatch {
      name = "add-missing-include.patch";
      url = "https://github.com/f3d-app/f3d/commit/3814f3356d888ce59bbe6eda0293c2de73b0c89a.patch";
      hash = "sha256-TeV8byIxX6PBEW06/sS7kHaSS99S88WiyzjHZ/Zh5x4=";
    })

    # https://github.com/f3d-app/f3d/pull/2286
    (fetchpatch {
      name = "fix_assimp_6_0_configuration.patch";
      url = "https://github.com/f3d-app/f3d/commit/9bed68ef2b5425c9600c81a7245f13ed2d4079b8.patch";
      hash = "sha256-u4VQiTTgFSYxdJ3wvQUfSTt2fcsXBO3p15f/cNRRCHo=";
    })
  ];

  nativeBuildInputs =
    [
      cmake