Skip to content

Commit 2f5bd17

Browse files
authored
hugin: switch to openexr_3 (#375893)
2 parents a8e27e4 + f3e5d7a commit 2f5bd17

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

pkgs/applications/graphics/hugin/default.nix

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
, flann
1515
, gettext
1616
, glew
17-
, ilmbase
1817
, lcms2
1918
, lensfun
2019
, libjpeg
@@ -25,7 +24,7 @@
2524
, libXmu
2625
, libGLU
2726
, libGL
28-
, openexr_3
27+
, openexr
2928
, panotools
3029
, perlPackages
3130
, sqlite
@@ -52,7 +51,6 @@ stdenv.mkDerivation rec {
5251
flann
5352
gettext
5453
glew
55-
ilmbase
5654
lcms2
5755
lensfun
5856
libjpeg
@@ -63,7 +61,7 @@ stdenv.mkDerivation rec {
6361
libXmu
6462
libGLU
6563
libGL
66-
openexr_3
64+
openexr
6765
panotools
6866
sqlite
6967
vigra
@@ -78,8 +76,6 @@ stdenv.mkDerivation rec {
7876
# disable installation of the python scripting interface
7977
cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ];
8078

81-
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
82-
8379
postInstall = ''
8480
for p in $out/bin/*; do
8581
wrapProgram "$p" \

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13787,6 +13787,7 @@ with pkgs;
1378713787

1378813788
hugin = callPackage ../applications/graphics/hugin {
1378913789
wxGTK = wxGTK32;
13790+
openexr = openexr_3;
1379013791
};
1379113792

1379213793
huggle = libsForQt5.callPackage ../applications/misc/huggle { };

0 commit comments

Comments
 (0)