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

Fix builds depending on libXft

Browse Source
This commit is contained in:
Eelco Dolstra 2012-09-27 12:38:48 -04:00
parent 5b7d7b11f3
commit 4a6a87eedc
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/freetype/default.nix
View File

@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall =
''
ln -s freetype2/freetype $out/include/freetype
'';
meta = { meta = {
description = "A font rendering engine"; description = "A font rendering engine";
homepage = http://www.freetype.org/; homepage = http://www.freetype.org/;

10
pkgs/servers/x11/xorg/overrides.nix
View File

@ -109,21 +109,19 @@ in
compositeproto = attrs: attrs // { compositeproto = attrs: attrs // {
propagatedBuildInputs = [ xorg.fixesproto ]; propagatedBuildInputs = [ xorg.fixesproto ];
}; };
libXcomposite = attrs: attrs // { libXcomposite = attrs: attrs // {
propagatedBuildInputs = [ xorg.libXfixes ]; propagatedBuildInputs = [ xorg.libXfixes ];
}; };
libXaw = attrs: attrs // { libXaw = attrs: attrs // {
propagatedBuildInputs = [ xorg.libXmu ]; propagatedBuildInputs = [ xorg.libXmu ];
}; };
libXft = attrs: attrs // { libXft = attrs: attrs // {
buildInputs = attrs.buildInputs ++ buildInputs = attrs.buildInputs ++
[ xorg.xproto xorg.libX11 xorg.renderproto ]; [ xorg.xproto xorg.libX11 xorg.renderproto ];
# probably, fontconfig and freetype could be added propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
# pkgconfig seems to be nice, too...
propagatedBuildInputs = [ xorg.libXrender ];
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
}; };