diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-20 09:00:08 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-20 09:00:08 +0000 |
| commit | cc896336efb0381df240600c6d6bc0232b576602 (patch) | |
| tree | 4237e82670031f10a7fe669c9b3c0d2cf357f7d7 /pkgs | |
| parent | 0159c5f8deb36dd42cf386937f779420f0e10d88 (diff) | |
| download | nixlib-cc896336efb0381df240600c6d6bc0232b576602.tar nixlib-cc896336efb0381df240600c6d6bc0232b576602.tar.gz nixlib-cc896336efb0381df240600c6d6bc0232b576602.tar.bz2 nixlib-cc896336efb0381df240600c6d6bc0232b576602.tar.lz nixlib-cc896336efb0381df240600c6d6bc0232b576602.tar.xz nixlib-cc896336efb0381df240600c6d6bc0232b576602.tar.zst nixlib-cc896336efb0381df240600c6d6bc0232b576602.zip | |
* Qt needs `which'. Also fix execute permission for
config.tests/unix. svn path=/nixpkgs/trunk/; revision=2069
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-3/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh index 60cb37a962ec..5566fb40ba38 100644 --- a/pkgs/development/libraries/qt-3/builder.sh +++ b/pkgs/development/libraries/qt-3/builder.sh @@ -15,7 +15,7 @@ preConfigure() { mv $i.tmp $i done - chmod +x config.tests/x11/*.test + chmod +x config.tests/*/*.test } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index a8c62ca99d76..83e9fdfd23b8 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,7 +1,7 @@ { xftSupport ? true , xrenderSupport ? true , stdenv, fetchurl, x11, libXft ? null, libXrender ? null -, zlib, libjpeg, libpng +, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation { md5 = "3e0a0c8429b0a974b39b5f535ddff01c"; }; - buildInputs = [x11 libXft libXrender zlib libjpeg libpng]; + buildInputs = [x11 libXft libXrender zlib libjpeg libpng which]; inherit xftSupport libXft xrenderSupport libXrender; inherit (libXft) freetype fontconfig; diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 4464ce0f9fa8..77a362244142 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -605,7 +605,7 @@ rec { }; qt3 = import ../development/libraries/qt-3 { - inherit fetchurl stdenv x11 zlib libjpeg libpng; + inherit fetchurl stdenv x11 zlib libjpeg libpng which; inherit (xlibs) libXft libXrender; }; |