vigra: unstable-2022-01-11 -> 1.12.1 (#375773)

NixOS · Jan 22, 2025 · 7046248 · 7046248
2 parents 9320f29 + 29a1440
commit 7046248
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
@@ -7,7 +7,6 @@
   fftw,
   fftwSinglePrec,
   hdf5,
-  ilmbase,
   libjpeg,
   libpng,
   libtiff,
@@ -20,24 +19,21 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vigra";
-  version = "unstable-2022-01-11";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "ukoethe";
     repo = "vigra";
-    rev = "093d57d15c8c237adf1704d96daa6393158ce299";
-    sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og=";
+    tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] version}";
+    hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8=";
   };
 
-  env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     boost
     fftw
     fftwSinglePrec
     hdf5
-    ilmbase
     libjpeg
     libpng
     libtiff

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10775,6 +10775,7 @@ with pkgs;
 
   vigra = callPackage ../development/libraries/vigra {
     hdf5 = hdf5.override { usev110Api = true; };
+    openexr = openexr_3;
   };
 
   vte-gtk4 = vte.override {