diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-06 09:51:02 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-06 09:51:02 -0500 |
| commit | 2e255a2edddfe5ca0e44f55d6e4bd82737cbb884 (patch) | |
| tree | c785d80650dc2d074244525401246fc6ef07a468 /pkgs/tools/misc | |
| parent | e3deccc0d7a42b0ae1d5e337cd6b0b9488c2295a (diff) | |
| parent | 16dafb018e09363bfae3949a8261c18ee7880781 (diff) | |
| download | nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.gz nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.bz2 nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.lz nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.xz nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.zst nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ba1154ab72d5..2cccee0a4e3b 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, lib -, autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext +, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withGTK ? false, gtk2 , withPython ? true @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { })]; patchFlags = "-p0"; - # FIXME: git isn't really used, but configuration fails without it buildInputs = [ - git autoconf automake gnum4 libtool perl pkgconfig gettext uthash + autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withGTK [ gtk2 pango ] @@ -38,7 +37,9 @@ stdenv.mkDerivation rec { ++ lib.optional withGTK "--enable-gtk2-use" ++ lib.optional (!withGTK) "--without-x"; + # work-around: git isn't really used, but configuration fails without it preConfigure = '' + export GIT="$(type -P true)" cp -r "${gnulib}" ./gnulib chmod +w -R ./gnulib ./bootstrap --skip-git --gnulib-srcdir=./gnulib |