diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:04:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:04:03 +0200 |
| commit | 07d12fbef1c59bcd9077de9d2606e7fa811bd93d (patch) | |
| tree | 0f5688094fa98e270a93650cd38fa3de91a4c722 /pkgs/tools/misc/fontforge | |
| parent | 30f551d8b25782611f869369e54539efe745f5ea (diff) | |
| download | nixpkgs-07d12fbef1c59bcd9077de9d2606e7fa811bd93d.tar nixpkgs-07d12fbef1c59bcd9077de9d2606e7fa811bd93d.tar.gz nixpkgs-07d12fbef1c59bcd9077de9d2606e7fa811bd93d.tar.bz2 nixpkgs-07d12fbef1c59bcd9077de9d2606e7fa811bd93d.tar.lz nixpkgs-07d12fbef1c59bcd9077de9d2606e7fa811bd93d.tar.xz nixpkgs-07d12fbef1c59bcd9077de9d2606e7fa811bd93d.tar.zst nixpkgs-07d12fbef1c59bcd9077de9d2606e7fa811bd93d.zip | |
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
Diffstat (limited to 'pkgs/tools/misc/fontforge')
| -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 ba1154ab72d..2cccee0a4e3 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 |