diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-30 12:10:24 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-30 12:10:24 +0000 |
| commit | ee4fe6ea8437bf171aeb46bba5a52da62928bc4c (patch) | |
| tree | 46755143801c29584625311b0a04c22247b5491d /pkgs/tools/misc/fontforge | |
| parent | 3386a0e63d90de7deb542125abc7b11fcb727c5d (diff) | |
| download | nixpkgs-ee4fe6ea8437bf171aeb46bba5a52da62928bc4c.tar nixpkgs-ee4fe6ea8437bf171aeb46bba5a52da62928bc4c.tar.gz nixpkgs-ee4fe6ea8437bf171aeb46bba5a52da62928bc4c.tar.bz2 nixpkgs-ee4fe6ea8437bf171aeb46bba5a52da62928bc4c.tar.lz nixpkgs-ee4fe6ea8437bf171aeb46bba5a52da62928bc4c.tar.xz nixpkgs-ee4fe6ea8437bf171aeb46bba5a52da62928bc4c.tar.zst nixpkgs-ee4fe6ea8437bf171aeb46bba5a52da62928bc4c.zip | |
* Drop pkgsOverriden.
svn path=/nixpkgs/trunk/; revision=22823
Diffstat (limited to 'pkgs/tools/misc/fontforge')
| -rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index b9532510411..9402fad2287 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, gettext, freetype, zlib , libungif, libpng, libjpeg, libtiff, libxml2 +, withX11 ? false , libX11 ? null, lib, xproto ? null, libXt ? null }: let version = "20090408"; name = "fontforge-${version}"; - in +in stdenv.mkDerivation { inherit name; @@ -16,7 +17,7 @@ stdenv.mkDerivation { sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4"; }; - configureFlags = if libX11 != null then "--with-gui=gdraw" else ""; + configureFlags = lib.optionalString withX11 "--with-gui=gdraw"; preConfigure = '' unpackFile ${freetype.src} @@ -30,9 +31,6 @@ stdenv.mkDerivation { ''; buildInputs = - [gettext freetype zlib libungif libpng libjpeg libtiff libxml2] - ++ lib.optional (libX11 != null) libX11 - ++ lib.optional (xproto != null) xproto - ++ lib.optional (libXt != null) libXt - ; + [ gettext freetype zlib libungif libpng libjpeg libtiff libxml2 ] + ++ lib.optionals withX11 [ libX11 xproto libXt ]; } |