Skip to content

Commit

Permalink
fontforge: get rid of output hash depending on git
Browse files Browse the repository at this point in the history
... to avoid git changes being mass rebuilds.
Thanks to Mic92 for the solution idea.
See discussion under: #19248
  • Loading branch information
vcunat committed Oct 5, 2016
1 parent 30f551d commit 07d12fb
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkgs/tools/misc/fontforge/default.nix
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 ]
Expand All @@ -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
Expand Down

0 comments on commit 07d12fb

Please sign in to comment.