b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fontforge: 20201107 -> 20220308

Browse source 
refactor the debian patch to apply
  still seems required to get the extra binaries

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
  (suggestion for partial applying the fetched patch)
This commit is contained in:
Evils 2022-03-09 11:32:58 +01:00 committed by Kerstin
parent 6cc25b31e6
commit 69da642a5a
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/tools/misc/fontforge/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchpatch, fetchFromGitHub, lib { stdenv, fetchpatch, fetchFromGitHub, lib
, cmake, perl, uthash, pkg-config, gettext , cmake, perl, uthash, pkg-config, gettext
, python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango , python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango
, readline, woff2, zeromq, libuninameslist , readline, woff2, zeromq
, withSpiro ? false, libspiro , withSpiro ? false, libspiro
, withGTK ? false, gtk3 , withGTK ? false, gtk3
, withGUI ? withGTK , withGUI ? withGTK
@ -14,13 +14,13 @@ assert withGTK -> withGUI;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fontforge"; pname = "fontforge";
version = "20201107"; version = "20220308";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; sha256 = "sha256-q+71PDPODl5fEEy3d1icRl+rBGY7AhH+2dMUKeBWGgI=";
}; };
patches = [ patches = [
@ -28,13 +28,11 @@ stdenv.mkDerivation rec {
# Taken from https://salsa.debian.org/fonts-team/fontforge/-/blob/master/debian/patches/0001-add-extra-cmake-install-rules.patch # Taken from https://salsa.debian.org/fonts-team/fontforge/-/blob/master/debian/patches/0001-add-extra-cmake-install-rules.patch
(fetchpatch { (fetchpatch {
url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch";
sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; excludes = [
}) # Already handled upstream: https://github.com/fontforge/fontforge/commit/f97a2cd7b344ec8fcb9f8bfb908e1b6f36326d20
# Fix segmentation fault with some fonts. "contrib/cidmap/CMakeLists.txt"
# This is merged and should be present in the next release. ];
(fetchpatch { sha256 = "iQwaGeBHUais979hGVbU2NxKozQSQkpYXjApxPuLI/4=";
url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch";
sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29";
}) })
]; ];
@ -52,7 +50,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ buildInputs = [
readline uthash woff2 zeromq libuninameslist readline uthash woff2 zeromq
python freetype zlib glib giflib libpng libjpeg libtiff libxml2 python freetype zlib glib giflib libpng libjpeg libtiff libxml2
] ]
++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withSpiro [ libspiro ]