public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source
This commit is contained in:
Thomas Tuegel
2016-10-06 09:51:02 -05:00
parent e3deccc0d7 16dafb018e
commit 2e255a2edd
95 changed files with 1365 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/misc/fontforge/default.nix
View File

@@ -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