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

libpng: improve multi-output handling

Browse Source
This commit is contained in:
Vladimír Čunát 2016-07-09 15:42:42 +02:00
parent b993903ce8
commit ae154ae8ef
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libpng/default.nix
View File

@ -21,17 +21,14 @@ in stdenv.mkDerivation rec {
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
outputs = [ "dev" "out" "man" ]; outputs = [ "dev" "out" "man" ];
outputBin = "dev";
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
preConfigure = "export bin=$dev";
# it's hard to cross-run tests and some check programs didn't compile anyway # it's hard to cross-run tests and some check programs didn't compile anyway
makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS="; makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
doCheck = ! stdenv ? cross; doCheck = ! stdenv ? cross;
postInstall = ''mv "$out/bin" "$dev/bin"'';
passthru = { inherit zlib; }; passthru = { inherit zlib; };
meta = with stdenv.lib; { meta = with stdenv.lib; {