From 2f63e26d040dca257b6d6ed0a5f3d1ef7a43773c Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Tue, 31 Mar 2015 21:49:45 -0400 Subject: [PATCH] fontforge: fix Darwin build --- pkgs/tools/misc/fontforge/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index e166d2e93c9..886495a27eb 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib , 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 , 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 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 = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]