JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ilmbase: Use separate outputs

Browse Source
This commit is contained in:
Eelco Dolstra 2016-09-01 18:11:21 +02:00
parent 68e216d604
commit 452afd1ed6
14 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/hugin/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
postInstall = ''
for p in $out/bin/*; do

2
pkgs/applications/graphics/krita/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
openjpeg opencolorio vc poppler_qt5 curl ilmbase
];
NIX_CFLAGS_COMPILE = [ "-I${ilmbase}/include/OpenEXR" ];
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
enableParallelBuilding = true;

2
pkgs/applications/graphics/luminance-hdr/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl";
})];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
buildInputs =
[

2
pkgs/applications/graphics/openimageio/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
preBuild = ''
makeFlags="ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr.dev} USE_PYTHON=0
makeFlags="ILMBASE_HOME=${ilmbase.dev} OPENEXR_HOME=${openexr.dev} USE_PYTHON=0
INSTALLDIR=$out dist_dir="
'';

2
pkgs/applications/graphics/qtpfsgui/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
preConfigure = ''
export CPATH="${ilmbase}/include/OpenEXR:$CPATH"
export CPATH="${ilmbase.dev}/include/OpenEXR:$CPATH"
'';
qmakeFlags = [

2
pkgs/applications/misc/blender/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
++ optional colladaSupport "-DWITH_OPENCOLLADA=ON";
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
enableParallelBuilding = true;

2
pkgs/desktops/kde-4.14/kde-runtime.nix
View File

@ -16,7 +16,7 @@ kde {
nativeBuildInputs = [ shared_mime_info ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
passthru.propagatedUserEnvPackages = [ virtuoso ];

2
pkgs/desktops/kde-5/applications/kdelibs/default.nix
View File

@ -27,7 +27,7 @@ kdeApp {
];
# cmake does not detect path to `ilmbase`
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"

2
pkgs/desktops/kde-5/applications/kio-extras.nix
View File

@ -18,5 +18,5 @@ kdeApp {
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
kpty libmtp libssh openexr openslp phonon qtsvg samba solid
];
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev or ilmbase}/include/OpenEXR" ];
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
}

2
pkgs/development/libraries/ilmbase/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
};
outputs = [ "out" "dev" ];
preConfigure = ''
./bootstrap
'';

2
pkgs/development/libraries/kde-frameworks/kimageformats.nix
View File

@ -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";
}

2
pkgs/development/libraries/opencv/3.x.nix
View File

@ -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"}"

2
pkgs/development/libraries/opencv/default.nix
View File

@ -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)

2
pkgs/development/libraries/vigra/default.nix
View File

@ -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 ];