From 9a457db61d5836e72b989336c9a8129fc611bb57 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Sun, 25 Feb 2007 15:54:15 +0000 Subject: [PATCH] * Some font hackery. svn path=/nixpkgs/trunk/; revision=8042 --- pkgs/servers/x11/xorg/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a9fc6de201f6..3d6e83a00b17 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -332,7 +332,7 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/font-cursor-misc-X11R7.0-1.0.0.tar.bz2; md5 = "82e89de0e1b9c95f32b0fc12f5131d2c"; }; - buildInputs = [pkgconfig ]; + buildInputs = [pkgconfig fontutil mkfontdir mkfontscale bdftopcf ]; }) // {inherit ;}; fontdaewoomisc = (stdenv.mkDerivation { @@ -432,7 +432,9 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/font-misc-misc-X11R7.0-1.0.0.tar.bz2; md5 = "4a5a7987183a9e1ea232c8391ae4c244"; }; - buildInputs = [pkgconfig fontutil ]; + buildInputs = [pkgconfig fontutil mkfontdir mkfontscale bdftopcf ]; + # !!! hack + preFixup = "ln -s ${fontalias}/lib/X11/fonts/misc/fonts.alias $out/lib/X11/fonts/misc/fonts.alias"; }) // {inherit fontutil ;}; fontmuttmisc = (stdenv.mkDerivation {