diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-19 23:27:35 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-19 23:27:35 +0000 |
commit | 44fa4a2980bc57f770f9b6ad89e45374aaa8e165 (patch) | |
tree | 0262136399d7d595643dddce6cc681d742361b9c /pkgs/system | |
parent | 35443bddea261b141223fbd94fc1c16651f9eccf (diff) | |
download | nixpkgs-44fa4a2980bc57f770f9b6ad89e45374aaa8e165.tar nixpkgs-44fa4a2980bc57f770f9b6ad89e45374aaa8e165.tar.gz nixpkgs-44fa4a2980bc57f770f9b6ad89e45374aaa8e165.tar.bz2 nixpkgs-44fa4a2980bc57f770f9b6ad89e45374aaa8e165.tar.lz nixpkgs-44fa4a2980bc57f770f9b6ad89e45374aaa8e165.tar.xz nixpkgs-44fa4a2980bc57f770f9b6ad89e45374aaa8e165.tar.zst nixpkgs-44fa4a2980bc57f770f9b6ad89e45374aaa8e165.zip |
* 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
Diffstat (limited to 'pkgs/system')
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 2 | ||||
-rw-r--r-- | pkgs/system/populate-cache.nix | 1 |
2 files changed, 2 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; }; diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index fb19c7936b5..05cbc0b63ad 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -71,6 +71,7 @@ let { openssl mktemp strace + qt3 postgresql jetty |