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

fontforge: fix Darwin build

Browse Source
This commit is contained in:
Spencer Whitt 2015-03-31 21:49:45 -04:00
parent 0253cf06c0
commit 2f63e26d04
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/fontforge/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, lib { stdenv, fetchurl, fetchpatch, lib
, autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext , autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext
, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
, withGTK ? false, gtk2 , withGTK ? false, gtk2
, withPython ? false # python-scripting was breaking inconsolata and libertine builds , withPython ? false # python-scripting was breaking inconsolata and libertine builds
}: }:
@ -30,7 +30,9 @@ stdenv.mkDerivation {
git autoconf automake gnum4 libtool perl pkgconfig gettext uthash git autoconf automake gnum4 libtool perl pkgconfig gettext uthash
python freetype zlib glib libungif libpng libjpeg libtiff libxml2 python freetype zlib glib libungif libpng libjpeg libtiff libxml2
] ]
++ lib.optionals withGTK [ gtk2 ]; ++ lib.optionals withGTK [ gtk2 ]
# I'm not sure why pango doesn't seem necessary on Linux
++ lib.optionals stdenv.isDarwin [ pango ];
configureFlags = configureFlags =
lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]