public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Qt needs `which'. Also fix execute permission for

Browse Source 
config.tests/unix.

svn path=/nixpkgs/trunk/; revision=2069
This commit is contained in:
Eelco Dolstra 2005-01-20 09:00:08 +00:00
parent 0159c5f8de
commit cc896336ef
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-3/builder.sh
View File

@ -15,7 +15,7 @@ preConfigure() {
mv $i.tmp $i mv $i.tmp $i
done done
chmod +x config.tests/x11/*.test chmod +x config.tests/*/*.test
} }

4
pkgs/development/libraries/qt-3/default.nix
View File

@ -1,7 +1,7 @@
{ xftSupport ? true { xftSupport ? true
, xrenderSupport ? true , xrenderSupport ? true
, stdenv, fetchurl, x11, libXft ? null, libXrender ? null , stdenv, fetchurl, x11, libXft ? null, libXrender ? null
, zlib, libjpeg, libpng , zlib, libjpeg, libpng, which
}: }:
assert xftSupport -> libXft != null; assert xftSupport -> libXft != null;
@ -16,7 +16,7 @@ stdenv.mkDerivation {
md5 = "3e0a0c8429b0a974b39b5f535ddff01c"; md5 = "3e0a0c8429b0a974b39b5f535ddff01c";
}; };
buildInputs = [x11 libXft libXrender zlib libjpeg libpng]; buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
inherit xftSupport libXft xrenderSupport libXrender; inherit xftSupport libXft xrenderSupport libXrender;
inherit (libXft) freetype fontconfig; inherit (libXft) freetype fontconfig;

2
pkgs/system/all-packages-generic.nix
View File

@ -605,7 +605,7 @@ rec {
}; };
qt3 = import ../development/libraries/qt-3 { 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; inherit (xlibs) libXft libXrender;
}; };