diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-08-21 12:31:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-08-21 12:31:33 +0000 |
| commit | 2f21c59a3f49d0f4f9b64743d5c65a927433f463 (patch) | |
| tree | f7531b8e4f02a299d382cd1d93a2c275af115b2b /pkgs | |
| parent | 1a6cd0ce1a608d85774a23247dc3150a7f863035 (diff) | |
| download | nixpkgs-2f21c59a3f49d0f4f9b64743d5c65a927433f463.tar nixpkgs-2f21c59a3f49d0f4f9b64743d5c65a927433f463.tar.gz nixpkgs-2f21c59a3f49d0f4f9b64743d5c65a927433f463.tar.bz2 nixpkgs-2f21c59a3f49d0f4f9b64743d5c65a927433f463.tar.lz nixpkgs-2f21c59a3f49d0f4f9b64743d5c65a927433f463.tar.xz nixpkgs-2f21c59a3f49d0f4f9b64743d5c65a927433f463.tar.zst nixpkgs-2f21c59a3f49d0f4f9b64743d5c65a927433f463.zip | |
* Use FontForge to give Wine better fonts.
svn path=/nixpkgs/trunk/; revision=9181
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 29 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 13fb6a0937d..218a89e1759 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/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 = [ diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix new file mode 100644 index 00000000000..576af9a69e4 --- /dev/null +++ b/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]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9785e7261e..fee9f6d1306 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { |