diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-19 09:18:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-19 09:18:32 +0100 |
commit | c65707bc25b252bc7474cb443f4fda1a93a1b12c (patch) | |
tree | 5e3364cc329c8db2362e8d8006ad8cf1d679e4c3 /pkgs/tools | |
parent | 7b9d9fe076a0a231043cf9dcc4b1308aad55ea1a (diff) | |
parent | 9d88ee08f6bf8a51f99872aedefd4139635f24ea (diff) | |
download | nixlib-c65707bc25b252bc7474cb443f4fda1a93a1b12c.tar nixlib-c65707bc25b252bc7474cb443f4fda1a93a1b12c.tar.gz nixlib-c65707bc25b252bc7474cb443f4fda1a93a1b12c.tar.bz2 nixlib-c65707bc25b252bc7474cb443f4fda1a93a1b12c.tar.lz nixlib-c65707bc25b252bc7474cb443f4fda1a93a1b12c.tar.xz nixlib-c65707bc25b252bc7474cb443f4fda1a93a1b12c.tar.zst nixlib-c65707bc25b252bc7474cb443f4fda1a93a1b12c.zip |
Merge pull request #80252 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch | 31 |
2 files changed, 7 insertions, 41 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 6239e8395981..635d786da53a 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib -, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext +, autoconf, automake, gnum4, libtool, perl, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango -, readline, woff2, zeromq +, readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro , withGTK ? false, gtk2 , withPython ? true @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { pname = "fontforge"; - version = "20190413"; + version = "20190801"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7"; + sha256 = "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"; }; - patches = [ ./fontforge-20140813-use-system-uthash.patch ]; - # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ]; buildInputs = [ - readline uthash woff2 zeromq + readline uthash woff2 zeromq libuninameslist python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] @@ -53,9 +51,7 @@ stdenv.mkDerivation rec { export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) export GIT="$(type -P true)" - cp -r "${gnulib}" ./gnulib - chmod +w -R ./gnulib - ./bootstrap --skip-git --gnulib-srcdir=./gnulib --force + ./bootstrap --skip-git --force ''; doCheck = false; # tries to wget some fonts @@ -74,5 +70,6 @@ stdenv.mkDerivation rec { homepage = http://fontforge.github.io; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch deleted file mode 100644 index fb53c619b2bc..000000000000 --- a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.am.old 2014-08-12 10:07:32.000000000 +0530 -+++ b/Makefile.am 2014-09-08 16:23:56.046996941 +0530 -@@ -43,7 +43,6 @@ - AM_CPPFLAGS = - AM_LDFLAGS = - --BUILT_SOURCES = uthash/src - EXTRA_DIST = - CLEANFILES = - MOSTLYCLEANFILES = -@@ -113,8 +112,7 @@ - Packaging/FontForge-doc.spec \ - Packaging/FontForge.spec \ - Packaging/FontForge.static.spec \ - README \ -- uthash/src \ - $(NULL) - - #-------------------------------------------------------------------------- -@@ -129,11 +127,6 @@ - - - #-------------------------------------------------------------------------- --uthash/src: -- if [ ! -e uthash/src ]; then \ -- if [ -e uthash ] ; then rm -r uthash ; fi ; \ -- git clone https://github.com/troydhanson/uthash ; \ -- fi ; - - # We import a selection of targets from Frank's standard packaging Makefile. - |