alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Pass libpng12 to qt3 and kdelibs3

Browse source 
svn path=/nixpkgs/branches/libpng15/; revision=31441
This commit is contained in:
Yury G. Kudryashov 2012-01-08 20:51:49 +00:00
parent 2ebcb95219
commit af58b6ec5f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/desktops/kde-3/kdelibs/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre { 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 , freetype, bzip2, cups, attr, acl
}: }:
@ -22,10 +22,8 @@ stdenv.mkDerivation {
./kdelibs-3.5.10-openssl_1.0.0.patch ./kdelibs-3.5.10-openssl_1.0.0.patch
]; ];
passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;};
buildInputs = [ 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 libxslt expat libtool freetype bzip2 cups
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
]; ];
@ -45,7 +43,6 @@ stdenv.mkDerivation {
configureFlags = '' configureFlags = ''
--without-arts --without-arts
--with-ssl-dir=${openssl} --with-ssl-dir=${openssl}
--with-extra-includes=${libjpeg}/include
--x-includes=${xlibs.libX11}/include --x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib --x-libraries=${xlibs.libX11}/lib
''; '';

7
pkgs/development/libraries/qt-3/default.nix
View file

@ -7,9 +7,11 @@
, threadSupport ? true , threadSupport ? true
, mysqlSupport ? false, mysql ? null , mysqlSupport ? false, mysql ? null
, openglSupport ? false, mesa ? null, libXmu ? 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 xftSupport -> libXft != null;
assert xrenderSupport -> xftSupport && libXrender != null; assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null && randrproto != null; assert xrandrSupport -> libXrandr != null && randrproto != null;
@ -29,7 +31,8 @@ stdenv.mkDerivation {
sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
}; };
buildInputs = [x11 libXft libXrender zlib libjpeg libpng which]; buildNativeInputs = [ which ];
propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
configureFlags = " configureFlags = "
-v -v