diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-09 15:42:42 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-09 16:50:14 +0200 |
| commit | ae154ae8ef45a23239c9bd1bdf5c787013d35d01 (patch) | |
| tree | fcc4505ffa4fdad5f4bbe8c6317fcb78194b0e1d /pkgs/development/libraries/libpng | |
| parent | b993903ce8f1958bae3617666ddeb4d683434ece (diff) | |
| download | nixpkgs-ae154ae8ef45a23239c9bd1bdf5c787013d35d01.tar nixpkgs-ae154ae8ef45a23239c9bd1bdf5c787013d35d01.tar.gz nixpkgs-ae154ae8ef45a23239c9bd1bdf5c787013d35d01.tar.bz2 nixpkgs-ae154ae8ef45a23239c9bd1bdf5c787013d35d01.tar.lz nixpkgs-ae154ae8ef45a23239c9bd1bdf5c787013d35d01.tar.xz nixpkgs-ae154ae8ef45a23239c9bd1bdf5c787013d35d01.tar.zst nixpkgs-ae154ae8ef45a23239c9bd1bdf5c787013d35d01.zip | |
libpng: improve multi-output handling
Diffstat (limited to 'pkgs/development/libraries/libpng')
| -rw-r--r-- | pkgs/development/libraries/libpng/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index c1614a277e9..9c4a1b13e01 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -21,17 +21,14 @@ in stdenv.mkDerivation rec { postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; outputs = [ "dev" "out" "man" ]; + outputBin = "dev"; propagatedBuildInputs = [ zlib ]; - preConfigure = "export bin=$dev"; - # it's hard to cross-run tests and some check programs didn't compile anyway makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS="; doCheck = ! stdenv ? cross; - postInstall = ''mv "$out/bin" "$dev/bin"''; - passthru = { inherit zlib; }; meta = with stdenv.lib; { |