From af58b6ec5ffdfcd8299a1882c009f1138db3bf53 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 8 Jan 2012 20:51:49 +0000
Subject: [PATCH] Pass libpng12 to qt3 and kdelibs3

svn path=/nixpkgs/branches/libpng15/; revision=31441
---
 pkgs/desktops/kde-3/kdelibs/default.nix     | 7 ++-----
 pkgs/development/libraries/qt-3/default.nix | 7 +++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix
index 0f3494c05811..2c9e8e3563a8 100644
--- a/pkgs/desktops/kde-3/kdelibs/default.nix
+++ b/pkgs/desktops/kde-3/kdelibs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
-, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
+, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
 , freetype, bzip2, cups, attr, acl
 }:
 
@@ -22,10 +22,8 @@ stdenv.mkDerivation {
     ./kdelibs-3.5.10-openssl_1.0.0.patch
   ];
 
-  passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;};
-  
   buildInputs = [
-    zlib perl qt3 openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+    zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
     libxslt expat libtool freetype bzip2 cups
     xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
   ];
@@ -45,7 +43,6 @@ stdenv.mkDerivation {
   configureFlags = ''
     --without-arts 
     --with-ssl-dir=${openssl}
-    --with-extra-includes=${libjpeg}/include
     --x-includes=${xlibs.libX11}/include
     --x-libraries=${xlibs.libX11}/lib
   '';
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index e023235b936c..fa6857c1284f 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -7,9 +7,11 @@
 , threadSupport ? true
 , mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng, which
+, x11, xextproto, zlib, libjpeg, libpng12, which
 }:
 
+let libpng = libpng12; in
+
 assert xftSupport -> libXft != null;
 assert xrenderSupport -> xftSupport && libXrender != null;
 assert xrandrSupport -> libXrandr != null && randrproto != null;
@@ -29,7 +31,8 @@ stdenv.mkDerivation {
     sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
   };
 
-  buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
+  buildNativeInputs = [ which ];
+  propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
 
   configureFlags = "
     -v