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

  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

1 files changed, 1 insertions, 1 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 6b22cc492a8..4464ce0f9fa 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -604,7 +604,7 @@ rec {
     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 (xlibs) libXft libXrender;
   };