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

* libXft: pass through the freetype and fontconfig inputs (Qt needs

Browse Source 
them).
* Add Qt to the cache.  Contrary to what the previous commit message
  said, there is nothing wrong with the Qt build.  It was just a
  problem on my local machine (you shouldn't run `./configure -help'
  in a temporary build directory; it overwrites some files of the
  build in progress).

svn path=/nixpkgs/trunk/; revision=2067
This commit is contained in:
Eelco Dolstra 2005-01-19 23:27:35 +00:00
parent 35443bddea
commit 44fa4a2980
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/xlibs/libXft/default.nix
View File

@ -3,7 +3,7 @@
# !!! assert freetype `elem` fontconfig.buildInputs or some such # !!! assert freetype `elem` fontconfig.buildInputs or some such
# assert freetype == fontconfig.freetype; # assert freetype == fontconfig.freetype;
stdenv.mkDerivation { (stdenv.mkDerivation {
name = "libXft-2.1.6"; name = "libXft-2.1.6";
src = fetchurl { src = fetchurl {
url = http://freedesktop.org/~xlibs/release/libXft-2.1.6.tar.bz2; url = http://freedesktop.org/~xlibs/release/libXft-2.1.6.tar.bz2;
@ -11,4 +11,4 @@ stdenv.mkDerivation {
}; };
buildInputs = [pkgconfig]; buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libXrender freetype fontconfig]; propagatedBuildInputs = [libX11 libXrender freetype fontconfig];
} }) // {inherit freetype fontconfig;}

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

@ -604,7 +604,7 @@ rec {
inherit fetchurl stdenv x11 libtiff libjpeg libpng; inherit fetchurl stdenv x11 libtiff libjpeg libpng;
}; };
qt = 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;
inherit (xlibs) libXft libXrender; inherit (xlibs) libXft libXrender;
}; };

1
pkgs/system/populate-cache.nix
View File

@ -71,6 +71,7 @@ let {
openssl openssl
mktemp mktemp
strace strace
qt3
postgresql postgresql
jetty jetty