From f3e5d7a521b65e6ba779d6acb1db22f505fef969 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 22 Jan 2025 10:24:13 +0100 Subject: [PATCH] hugin: switch to openexr_3 --- pkgs/applications/graphics/hugin/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 16d4cc923b5f..f6d038f3a984 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -14,7 +14,6 @@ , flann , gettext , glew -, ilmbase , lcms2 , lensfun , libjpeg @@ -25,7 +24,7 @@ , libXmu , libGLU , libGL -, openexr_3 +, openexr , panotools , perlPackages , sqlite @@ -52,7 +51,6 @@ stdenv.mkDerivation rec { flann gettext glew - ilmbase lcms2 lensfun libjpeg @@ -63,7 +61,7 @@ stdenv.mkDerivation rec { libXmu libGLU libGL - openexr_3 + openexr panotools sqlite vigra @@ -78,8 +76,6 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - postInstall = '' for p in $out/bin/*; do wrapProgram "$p" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7411f98dc38b..e5e6e7724f41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13780,6 +13780,7 @@ with pkgs; hugin = callPackage ../applications/graphics/hugin { wxGTK = wxGTK32; + openexr = openexr_3; }; huggle = libsForQt5.callPackage ../applications/misc/huggle { };