0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

hugin: switch to openexr_3 (#375893)

This commit is contained in:
Christoph Hrdinka 2025-01-24 10:34:41 +01:00 committed by GitHub
commit 2f5bd177a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions

View file

@ -14,7 +14,6 @@
, flann , flann
, gettext , gettext
, glew , glew
, ilmbase
, lcms2 , lcms2
, lensfun , lensfun
, libjpeg , libjpeg
@ -25,7 +24,7 @@
, libXmu , libXmu
, libGLU , libGLU
, libGL , libGL
, openexr_3 , openexr
, panotools , panotools
, perlPackages , perlPackages
, sqlite , sqlite
@ -52,7 +51,6 @@ stdenv.mkDerivation rec {
flann flann
gettext gettext
glew glew
ilmbase
lcms2 lcms2
lensfun lensfun
libjpeg libjpeg
@ -63,7 +61,7 @@ stdenv.mkDerivation rec {
libXmu libXmu
libGLU libGLU
libGL libGL
openexr_3 openexr
panotools panotools
sqlite sqlite
vigra vigra
@ -78,8 +76,6 @@ stdenv.mkDerivation rec {
# disable installation of the python scripting interface # disable installation of the python scripting interface
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
postInstall = '' postInstall = ''
for p in $out/bin/*; do for p in $out/bin/*; do
wrapProgram "$p" \ wrapProgram "$p" \

View file

@ -13787,6 +13787,7 @@ with pkgs;
hugin = callPackage ../applications/graphics/hugin { hugin = callPackage ../applications/graphics/hugin {
wxGTK = wxGTK32; wxGTK = wxGTK32;
openexr = openexr_3;
}; };
huggle = libsForQt5.callPackage ../applications/misc/huggle { }; huggle = libsForQt5.callPackage ../applications/misc/huggle { };