diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 20:51:49 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 20:51:49 +0000 |
| commit | af58b6ec5ffdfcd8299a1882c009f1138db3bf53 (patch) | |
| tree | 41bf635679f4caba5ad6a1c49afc128590037524 /pkgs/development/libraries/qt-3 | |
| parent | 2ebcb95219dc32d54db20e8425c0ee5ca48cabe4 (diff) | |
| download | nixpkgs-af58b6ec5ffdfcd8299a1882c009f1138db3bf53.tar nixpkgs-af58b6ec5ffdfcd8299a1882c009f1138db3bf53.tar.gz nixpkgs-af58b6ec5ffdfcd8299a1882c009f1138db3bf53.tar.bz2 nixpkgs-af58b6ec5ffdfcd8299a1882c009f1138db3bf53.tar.lz nixpkgs-af58b6ec5ffdfcd8299a1882c009f1138db3bf53.tar.xz nixpkgs-af58b6ec5ffdfcd8299a1882c009f1138db3bf53.tar.zst nixpkgs-af58b6ec5ffdfcd8299a1882c009f1138db3bf53.zip | |
Pass libpng12 to qt3 and kdelibs3
svn path=/nixpkgs/branches/libpng15/; revision=31441
Diffstat (limited to 'pkgs/development/libraries/qt-3')
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index e023235b936..fa6857c1284 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 |