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

* Use FontForge to give Wine better fonts.

Browse Source 
svn path=/nixpkgs/trunk/; revision=9181
This commit is contained in:
Eelco Dolstra 2007-08-21 12:31:33 +00:00
parent 1a6cd0ce1a
commit 2f21c59a3f
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/emulators/wine/default.nix
View File

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

20
pkgs/tools/misc/fontforge/default.nix Normal file
View File

@ -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];
}

8
pkgs/top-level/all-packages.nix
View File

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