lol

fontforge: 20200314 -> 20201107

also use fetchFromGitHub for getting the source.

+7 -18
+7 -18
pkgs/tools/misc/fontforge/default.nix
··· 1 - { stdenv, fetchurl, lib 2 - , fetchpatch 1 + { stdenv, fetchFromGitHub, lib 3 2 , cmake, perl, uthash, pkg-config, gettext 4 3 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango 5 4 , readline, woff2, zeromq, libuninameslist ··· 15 14 16 15 stdenv.mkDerivation rec { 17 16 pname = "fontforge"; 18 - version = "20200314"; 17 + version = "20201107"; 19 18 20 - src = fetchurl { 21 - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; 22 - sha256 = "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"; 19 + src = fetchFromGitHub { 20 + owner = pname; 21 + repo = pname; 22 + rev = version; 23 + sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; 23 24 }; 24 - 25 - patches = [ 26 - # Unreleased fix for https://github.com/fontforge/fontforge/issues/4229 27 - # which is required to fix an uninterposated `${CMAKE_INSTALL_PREFIX}/lib`, see 28 - # see https://github.com/nh2/static-haskell-nix/pull/98#issuecomment-665395399 29 - # TODO: Remove https://github.com/fontforge/fontforge/pull/4232 is in a release. 30 - (fetchpatch { 31 - name = "fontforge-cmake-set-rpath-to-the-configure-time-CMAKE_INSTALL_PREFIX"; 32 - url = "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch"; 33 - sha256 = "14qfp8pwh0vzzib4hq2nc6xhn8lc1cal1sb0lqwb2q5dijqx5kqk"; 34 - }) 35 - ]; 36 25 37 26 # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps 38 27 postPatch = ''