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

openexr, libyaml-cpp: Fix output order to match others

Browse Source 
This was changed in https://github.com/NixOS/nixpkgs/pull/14766

@edolstra
This commit is contained in:
Tuomas Tynkkynen 2016-09-01 16:29:00 +03:00
parent 21666526b9
commit 75b5922391
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
qmakeFlags = [ qmakeFlags = [
"EXIV2PATH=${exiv2.dev}/include/exiv2" "EXIV2PATH=${exiv2.dev}/include/exiv2"
"OPENEXRDIR=${openexr}/include/OpenEXR" "OPENEXRDIR=${openexr.dev}/include/OpenEXR"
"FFTW3DIR=${fftwSinglePrec.dev}/include" "FFTW3DIR=${fftwSinglePrec.dev}/include"
"LIBTIFFDIR=${libtiff.dev}/include" "LIBTIFFDIR=${libtiff.dev}/include"
]; ];

2
pkgs/development/libraries/libyaml-cpp/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a"; sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a";
}; };
outputs = [ "dev" "out" ]; outputs = [ "out" "dev" ];
buildInputs = [ cmake boost ]; buildInputs = [ cmake boost ];

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

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
}; };
outputs = [ "dev" "bin" "out" "doc" ]; outputs = [ "bin" "dev" "out" "doc" ];
preConfigure = '' preConfigure = ''
./bootstrap ./bootstrap