* Use FontForge to give Wine better fonts.

svn path=/nixpkgs/trunk/; revision=9181

pkgs/misc/emulators/wine/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
-, ncurses, libpng, libjpeg, lcms, freetype
+, ncurses, libpng, libjpeg, lcms, freetype, fontforge
 }:
 
 assert stdenv.isLinux;
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     xlibs.xlibs flex bison xlibs.libXi mesa
     xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
     xlibs.libXrender xlibs.libXxf86vm alsaLib ncurses
-    libpng libjpeg lcms 
+    libpng libjpeg lcms fontforge
   ];
 
   patches = [

pkgs/tools/misc/fontforge/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, gettext, freetype, zlib
+, libungif, libpng, libjpeg, libtiff, libxml2
+}:
+
+stdenv.mkDerivation {
+  name = "fontforge-20070808";
+  
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-20070808.tar.bz2;
+    sha256 = "1b3x5djn9ifvszwmgwmn1jwl50pbq6fzvbmgx0qjg0m60m3v44nx";
+  };
+
+  preConfigure = "
+    unpackFile ${freetype.src}
+    freetypeSrcPath=$(echo `pwd`/freetype-*)
+    configureFlags=\"$configureFlags --with-freetype-src=$freetypeSrcPath\"
+  ";
+
+  buildInputs = [gettext freetype zlib libungif libpng libjpeg libtiff libxml2];
+}

pkgs/top-level/all-packages.nix

@@ -355,6 +355,11 @@ rec {
     inherit stdenv findutils;
   }));
 
+  fontforge = import ../tools/misc/fontforge {
+    inherit fetchurl stdenv gettext freetype zlib
+      libungif libpng libjpeg libtiff libxml2;
+  };
+
   gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
     (import ../tools/text/gawk {
       inherit fetchurl stdenv;
@@ -3822,7 +3827,8 @@ rec {
   wine = import ../misc/emulators/wine {
     stdenv = overrideGCC stdenv gcc41NPTL;
     inherit fetchurl flex bison mesa ncurses
-      libpng libjpeg alsaLib lcms xlibs freetype;
+      libpng libjpeg alsaLib lcms xlibs freetype
+      fontforge;
   };
 
   xsane = import ../misc/xsane {