From 44fa4a2980bc57f770f9b6ad89e45374aaa8e165 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Jan 2005 23:27:35 +0000 Subject: * 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 --- pkgs/development/libraries/xlibs/libXft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') 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 -- cgit 1.4.1