From aa0918867bf22090bde6da387fc4fe7fd0e8be74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jan 2007 17:18:14 +0000
Subject: [PATCH] * Get some TTF fonts to work. Must merge with the generator.
svn path=/nixpkgs/trunk/; revision=7708
---
pkgs/servers/x11/xorg/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3802a15e9454..c3634b0f9a5a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -252,7 +252,7 @@ rec {
url = http://nix.cs.uu.nl/dist/tarballs/font-bh-ttf-X11R7.0-1.0.0.tar.bz2;
md5 = "53b984889aec3c0c2eb07f8aaa49dba9";
};
- buildInputs = [pkgconfig ];
+ buildInputs = [pkgconfig mkfontdir mkfontscale fontconfig ];
}) // {inherit ;};
fontbhtype1 = (stdenv.mkDerivation {
@@ -1122,7 +1122,8 @@ rec {
url = http://nix.cs.uu.nl/dist/tarballs/mkfontdir-X11R7.1-1.0.2.tar.bz2;
md5 = "384ee10787c455c520bcf031989de6f3";
};
- buildInputs = [pkgconfig ];
+ buildInputs = [pkgconfig mkfontscale ];
+ preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR $(dirname $(type -tp mkfontscale))";
}) // {inherit ;};
mkfontscale = (stdenv.mkDerivation {