diff options
| author | Volth <volth@webmaster.ms> | 2017-08-12 22:53:29 +0000 |
|---|---|---|
| committer | Volth <volth@webmaster.ms> | 2017-08-13 16:13:19 +0000 |
| commit | c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8 (patch) | |
| tree | 52ad0b9091d7cf2e14c8faf92a35b785e299c225 /pkgs/tools/misc/fontforge | |
| parent | 038507969699230fdc0b3086ad9cfaad7058f389 (diff) | |
| download | nixlib-c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8.tar nixlib-c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8.tar.gz nixlib-c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8.tar.bz2 nixlib-c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8.tar.lz nixlib-c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8.tar.xz nixlib-c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8.tar.zst nixlib-c4fb72cbb573ddc2ad3c73526cdde7e47440dfd8.zip | |
$SOURCE_DATE_EPOCH moved to preConfigure
Diffstat (limited to 'pkgs/tools/misc/fontforge')
| -rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/misc/fontforge/fontforge-fonttools.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index f79bb123b34e..04abaa87611c 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, lib, runCommand +{ stdenv, fetchFromGitHub, fetchpatch, lib , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withSpiro ? false, libspiro @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { name = "fontforge-${version}"; version = "20170730"; - # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19) - SOURCE_DATE_EPOCH = lib.fileContents (runCommand "unixtime-of-${version}" {} "date -d ${version} +%s > $out"); - src = fetchFromGitHub { owner = "fontforge"; repo = "fontforge"; @@ -49,6 +46,9 @@ stdenv.mkDerivation rec { # work-around: git isn't really used, but configuration fails without it preConfigure = '' + # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19) + export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) + export GIT="$(type -P true)" cp -r "${gnulib}" ./gnulib chmod +w -R ./gnulib diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix index 0f82f4ad6389..c65d8ed375d2 100644 --- a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix +++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''Small font tools shipped in FontForge contrib''; - license = fontforge.meta.license; + license = licenses.bsd3; maintainers = with maintainers; [ raskin ]; platforms = with platforms; unix; }; |