From c64a1332ec5f8eef9c443701900d367e4587919e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Aug 2013 09:54:38 +0200
Subject: [PATCH] libpng: Use multiple outputs

---
 pkgs/development/libraries/libpng/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index c537ce55cf27..f40028f89c0d 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -9,7 +9,7 @@ let whenPatched = stdenv.lib.optionalString apngSupport;
       sha256 = "0fy7p197ilr9phwqqk9h91s1mc28r6gj0w2ilrw5liagi71z75j1";
     };
 
-in stdenv.mkDerivation (rec {
+in stdenv.mkDerivation rec {
   name = "libpng" + whenPatched "-apng" + "-${version}";
 
   src = fetchurl {
@@ -17,6 +17,14 @@ in stdenv.mkDerivation (rec {
     sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw";
   };
 
+  outputs = [ "dev" "out" "man" ];
+
+  preConfigure = "export bin=$dev";
+
+  postPatch = stdenv.lib.optionalString apngSupport ''
+    gunzip < ${patch_src} | patch -Np1
+  '';
+
   propagatedBuildInputs = [ zlib ];
 
   doCheck = true;
@@ -29,10 +37,4 @@ in stdenv.mkDerivation (rec {
     license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
     platforms = stdenv.lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs apngSupport {
-
-  postPatch = ''
-    gunzip < ${patch_src} | patch -Np1
-  '';
-
-})
+}
\ No newline at end of file