diff options
| -rw-r--r-- | pkgs/development/libraries/xlibs/libXft/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/system/populate-cache.nix | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/xlibs/libXft/default.nix b/pkgs/development/libraries/xlibs/libXft/default.nix index faaabc32a2bad..0b4cf60686528 100644 --- a/pkgs/development/libraries/xlibs/libXft/default.nix +++ b/pkgs/development/libraries/xlibs/libXft/default.nix @@ -3,7 +3,7 @@ # !!! assert freetype `elem` fontconfig.buildInputs or some such # assert freetype == fontconfig.freetype; -stdenv.mkDerivation { +(stdenv.mkDerivation { name = "libXft-2.1.6"; src = fetchurl { url = http://freedesktop.org/~xlibs/release/libXft-2.1.6.tar.bz2; @@ -11,4 +11,4 @@ stdenv.mkDerivation { }; buildInputs = [pkgconfig]; propagatedBuildInputs = [libX11 libXrender freetype fontconfig]; -} +}) // {inherit freetype fontconfig;} \ No newline at end of file diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 6b22cc492a8ef..4464ce0f9fa82 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 fb19c7936b5b8..05cbc0b63ade0 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -71,6 +71,7 @@ let { openssl mktemp strace + qt3 postgresql jetty |