diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-01 18:11:21 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-01 18:57:43 +0200 |
| commit | 452afd1ed68a53e5c845f9df96d707b24d40b250 (patch) | |
| tree | 95969bea234b2c6cfb44048d8cdf96646b956841 /pkgs/development/libraries | |
| parent | 68e216d604445de24bd0002a2b7ab4b10a2c89fc (diff) | |
| download | nixpkgs-452afd1ed68a53e5c845f9df96d707b24d40b250.tar nixpkgs-452afd1ed68a53e5c845f9df96d707b24d40b250.tar.gz nixpkgs-452afd1ed68a53e5c845f9df96d707b24d40b250.tar.bz2 nixpkgs-452afd1ed68a53e5c845f9df96d707b24d40b250.tar.lz nixpkgs-452afd1ed68a53e5c845f9df96d707b24d40b250.tar.xz nixpkgs-452afd1ed68a53e5c845f9df96d707b24d40b250.tar.zst nixpkgs-452afd1ed68a53e5c845f9df96d707b24d40b250.zip | |
ilmbase: Use separate outputs
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/ilmbase/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kimageformats.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/vigra/default.nix | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 4df17d271a2..21c2c46105e 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' ./bootstrap ''; diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index ec22dc335d5..f05da98f553 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -7,5 +7,5 @@ kdeFramework { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; } diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 9ca59c9c73a..6a89a672b2c 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index f792e17890c..d7f4367739f 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 28852fd97d6..1dc35db43f9 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0"; }; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng libtiff numpy openexr python ]; |