mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 07:32:58 +00:00
ilmbase: Use separate outputs
This commit is contained in:
parent
68e216d604
commit
452afd1ed6
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
for p in $out/bin/*; do
|
for p in $out/bin/*; do
|
||||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
openjpeg opencolorio vc poppler_qt5 curl ilmbase
|
openjpeg opencolorio vc poppler_qt5 curl ilmbase
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [ "-I${ilmbase}/include/OpenEXR" ];
|
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl";
|
sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl";
|
||||||
})];
|
})];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
[
|
||||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
preBuild = ''
|
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="
|
INSTALLDIR=$out dist_dir="
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export CPATH="${ilmbase}/include/OpenEXR:$CPATH"
|
export CPATH="${ilmbase.dev}/include/OpenEXR:$CPATH"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
qmakeFlags = [
|
qmakeFlags = [
|
||||||
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
|
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
|
||||||
++ optional colladaSupport "-DWITH_OPENCOLLADA=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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ kde {
|
|||||||
|
|
||||||
nativeBuildInputs = [ shared_mime_info ];
|
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 ];
|
passthru.propagatedUserEnvPackages = [ virtuoso ];
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ kdeApp {
|
|||||||
];
|
];
|
||||||
|
|
||||||
# cmake does not detect path to `ilmbase`
|
# cmake does not detect path to `ilmbase`
|
||||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
|
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
|
||||||
|
@ -18,5 +18,5 @@ kdeApp {
|
|||||||
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
|
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
|
||||||
kpty libmtp libssh openexr openslp phonon qtsvg samba solid
|
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" ];
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
|
sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
./bootstrap
|
./bootstrap
|
||||||
'';
|
'';
|
||||||
|
@ -7,5 +7,5 @@ kdeFramework {
|
|||||||
name = "kimageformats";
|
name = "kimageformats";
|
||||||
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
||||||
nativeBuildInputs = [ ecm ];
|
nativeBuildInputs = [ ecm ];
|
||||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||||
}
|
}
|
||||||
|
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ cmake pkgconfig unzip ];
|
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 = [
|
cmakeFlags = [
|
||||||
"-DWITH_IPP=${if enableIpp then "ON" else "OFF"}"
|
"-DWITH_IPP=${if enableIpp then "ON" else "OFF"}"
|
||||||
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ cmake pkgconfig unzip ];
|
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 = [
|
cmakeFlags = [
|
||||||
(opencvFlag "TIFF" enableTIFF)
|
(opencvFlag "TIFF" enableTIFF)
|
||||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0";
|
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
|
buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
|
||||||
libtiff numpy openexr python ];
|
libtiff numpy openexr python ];
|
||||||
|
Loading…
Reference in New Issue
Block a user