fontforge: 20190413 -> 20190801
- Init libuninameslist at 20190701 as it is a new dependency to fontforge - Remove gnulib, as it is not used anymore - Remove a non-applying patch - Add myself as maintainer
This commit is contained in:
committed by
Frederik Rietdijk
parent
452f481853
commit
4496f8f4b8
@@ -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 ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user