@ -1,7 +1,7 @@
{ stdenv , fetchpatch , fetchFromGitHub , lib
, cmake , perl , uthash , pkg-config , gettext
, python , freetype , zlib , glib , giflib , libpng , libjpeg , libtiff , libxml2 , cairo , pango
, readline , woff2 , zeromq , libuninameslist
, readline , woff2 , zeromq
, withSpiro ? false , libspiro
, withGTK ? false , gtk3
, withGUI ? withGTK
@ -14,13 +14,13 @@ assert withGTK -> withGUI;
stdenv . mkDerivation rec {
pname = " f o n t f o r g e " ;
version = " 2 0 2 0 1 1 0 7 " ;
version = " 2 0 2 2 0 3 0 8 " ;
src = fetchFromGitHub {
owner = pname ;
repo = pname ;
rev = version ;
sha256 = " s h a 2 5 6 - R l / 5 l b X a P g I n d A N a D 0 I a k a D u s 6 T 5 3 F j i B b 4 5 F I u G r v c = " ;
sha256 = " s h a 2 5 6 - q + 7 1 P D P O D l 5 f E E y 3 d 1 i c R l + r B G Y 7 A h H + 2 d M U K e B W G g I = " ;
} ;
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
( fetchpatch {
url = " h t t p s : / / s a l s a . d e b i a n . o r g / f o n t s - t e a m / f o n t f o r g e / r a w / 7 6 b f f e 6 c c f 8 a b 2 0 a 0 c 8 1 4 7 6 a 8 0 a 8 7 a d 2 4 5 e 2 f d 1 c / d e b i a n / p a t c h e s / 0 0 0 1 - a d d - e x t r a - c m a k e - i n s t a l l - r u l e s . p a t c h " ;
sha256 = " u 3 D 9 o d 2 x L E C N E H h Z + 8 d k u v 9 8 1 8 t P k d P 6 y / T v d 9 C A D J g = " ;
} )
# Fix segmentation fault with some fonts.
# This is merged and should be present in the next release.
( fetchpatch {
url = " h t t p s : / / g i t h u b . c o m / f o n t f o r g e / f o n t f o r g e / c o m m i t / 6 9 e 2 6 3 b 2 a f f 2 9 a d 2 2 f 9 7 f 1 3 9 3 5 c f a 9 7 a 1 e a b f 2 0 7 . p a t c h " ;
sha256 = " 0 6 y y f 9 0 6 0 5 a q 6 p p f i z 8 3 m q k d m n a q 5 4 1 8 a x p 9 j g s j y j q 7 8 b 0 0 x b 2 9 " ;
excludes = [
# Already handled upstream: https://github.com/fontforge/fontforge/commit/f97a2cd7b344ec8fcb9f8bfb908e1b6f36326d20
" c o n t r i b / c i d m a p / C M a k e L i s t s . t x t "
] ;
sha256 = " i Q w a G e B H U a i s 9 7 9 h G V b U 2 N x K o z Q S Q k p Y X j A p x P u L I / 4 = " ;
} )
] ;
@ -52,7 +50,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ] ;
buildInputs = [
readline uthash woff2 zeromq libuninameslist
readline uthash woff2 zeromq
python freetype zlib glib giflib libpng libjpeg libtiff libxml2
]
++ lib . optionals withSpiro [ libspiro ]