fontforge: get rid of output hash depending on git

... to avoid git changes being mass rebuilds.
Thanks to Mic92 for the solution idea.
See discussion under: https://github.com/NixOS/nixpkgs/pull/19248
This commit is contained in:
Vladimír Čunát 2016-10-05 19:04:03 +02:00
parent 30f551d8b2
commit 07d12fbef1

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, lib { 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 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
, withGTK ? false, gtk2 , withGTK ? false, gtk2
, withPython ? true , withPython ? true
@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
})]; })];
patchFlags = "-p0"; patchFlags = "-p0";
# FIXME: git isn't really used, but configuration fails without it
buildInputs = [ 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 python freetype zlib glib libungif libpng libjpeg libtiff libxml2
] ]
++ lib.optionals withGTK [ gtk2 pango ] ++ lib.optionals withGTK [ gtk2 pango ]
@ -38,7 +37,9 @@ stdenv.mkDerivation rec {
++ lib.optional withGTK "--enable-gtk2-use" ++ lib.optional withGTK "--enable-gtk2-use"
++ lib.optional (!withGTK) "--without-x"; ++ lib.optional (!withGTK) "--without-x";
# work-around: git isn't really used, but configuration fails without it
preConfigure = '' preConfigure = ''
export GIT="$(type -P true)"
cp -r "${gnulib}" ./gnulib cp -r "${gnulib}" ./gnulib
chmod +w -R ./gnulib chmod +w -R ./gnulib
./bootstrap --skip-git --gnulib-srcdir=./gnulib ./bootstrap --skip-git --gnulib-srcdir=./gnulib