From ae154ae8ef45a23239c9bd1bdf5c787013d35d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 9 Jul 2016 15:42:42 +0200
Subject: [PATCH] libpng: improve multi-output handling

---
 pkgs/development/libraries/libpng/default.nix | 5 +----
 1 file changed, 1 insertion(+), 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; {