alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Added FontForge with X11 interface

Browse source 
svn path=/nixpkgs/trunk/; revision=10918
This commit is contained in:
Michael Raskin 2008-03-02 22:02:28 +00:00
parent 9ee09f4a55
commit 74aba16126
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/misc/fontforge/default.nix
View file

@ -1,5 +1,7 @@
{ stdenv, fetchurl, gettext, freetype, zlib
, libungif, libpng, libjpeg, libtiff, libxml2
, libX11 ? null , lib , xproto ? null
, libXt ? null
}:
stdenv.mkDerivation {
@ -14,7 +16,14 @@ stdenv.mkDerivation {
unpackFile ${freetype.src}
freetypeSrcPath=$(echo `pwd`/freetype-*)
configureFlags=\"$configureFlags --with-freetype-src=$freetypeSrcPath\"
";
"
+ (if libX11!=null then ''
configureFlags="$configureFlags --with-gui=gdraw";
'' else "");
buildInputs = [gettext freetype zlib libungif libpng libjpeg libtiff libxml2];
buildInputs = [gettext freetype zlib libungif libpng libjpeg libtiff libxml2]
++ (lib.optional (libX11!=null) libX11)
++ (lib.optional (xproto!=null) xproto)
++ (lib.optional (libXt!=null) libXt)
;
}

16
pkgs/top-level/all-packages.nix
View file

@ -522,11 +522,16 @@ rec {
inherit fetchurl stdenv;
};
fontforge = import ../tools/misc/fontforge {
fontforgeFun = lib.sumArgs (import ../tools/misc/fontforge) {
inherit fetchurl stdenv gettext freetype zlib
libungif libpng libjpeg libtiff libxml2;
libungif libpng libjpeg libtiff libxml2 lib;
};
fontforge = fontforgeFun null;
fontforgeX = fontforgeFun {
inherit (xlibs) libX11 xproto libXt;
} null;
gawk = useFromStdenv "gawk"
(import ../tools/text/gawk {
inherit fetchurl stdenv;
@ -4457,6 +4462,13 @@ rec {
inherit fetchurl stdenv;
};
junicodeFun = lib.sumArgs (selectVersion ../data/fonts/junicode "0.6.15") {
inherit builderDefs fontforge unzip;
inherit (xorg) mkfontdir mkfontscale;
};
junicode = junicodeFun null;
freefont_ttf = import ../data/fonts/freefont-ttf {
inherit fetchurl stdenv;
};