Author: urkud
Date: Sun Jan 8 20:51:49 2012
New Revision: 31441
URL: https://nixos.org/websvn/nix/?rev=31441&sc=1
Log:
Pass libpng12 to qt3 and kdelibs3
Modified:
nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
Modified: nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix Sun Jan
8 19:50:06 2012 (r31440)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix Sun Jan
8 20:51:49 2012 (r31441)
@@ -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 @@
./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 @@
configureFlags = ''
--without-arts
--with-ssl-dir=${openssl}
- --with-extra-includes=${libjpeg}/include
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
Sun Jan 8 19:50:06 2012 (r31440)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
Sun Jan 8 20:51:49 2012 (r31441)
@@ -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 @@
sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
};
- buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
+ buildNativeInputs = [ which ];
+ propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
configureFlags = "
-v
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
