diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
| commit | 57fd764a391a6215165c377e1936204f297905c9 (patch) | |
| tree | e93f78b2cb4718187f5b693e3655499ee6ba485a /pkgs/development/libraries/qt-3/default.nix | |
| parent | a88fdf8ef7cd09efb795b2b3a7e41ec95bdc457f (diff) | |
| parent | e657e2c455d17fddd6d79eb93a1d08836a2e2b28 (diff) | |
| download | nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.gz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.bz2 nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.lz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.xz nixpkgs-57fd764a391a6215165c377e1936204f297905c9.tar.zst nixpkgs-57fd764a391a6215165c377e1936204f297905c9.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
Diffstat (limited to 'pkgs/development/libraries/qt-3/default.nix')
| -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 c9cb14030a5..ba796259f70 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 |