mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
gnu: ghostscript: Add a new variant that depends on Freetype.
Fixes <https://bugs.gnu.org/34877>. Reported by Diego Nicola Barbato <dnbarbato@posteo.de> and sirmacik <sirmacik@wioo.waw.pl>. * gnu/packages/ghostscript.scm (ghostscript/fixed): New variable.
This commit is contained in:
parent
8c1379ba40
commit
466ff55c72
1 changed files with 21 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
||||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
||||||
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||||
|
@ -269,6 +269,26 @@ (define-public ghostscript
|
||||||
(home-page "https://www.ghostscript.com/")
|
(home-page "https://www.ghostscript.com/")
|
||||||
(license license:agpl3+)))
|
(license license:agpl3+)))
|
||||||
|
|
||||||
|
(define-public ghostscript/fixed
|
||||||
|
;; This adds the Freetype dependency (among other things), which fixes the
|
||||||
|
;; rendering issues described in <https://issues.guix.gnu.org/issue/34877>.
|
||||||
|
(package/inherit
|
||||||
|
ghostscript
|
||||||
|
(version (string-append (package-version ghostscript) "-1"))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments ghostscript)
|
||||||
|
((#:configure-flags flags ''())
|
||||||
|
`(append (list "--disable-compile-inits"
|
||||||
|
(string-append "--with-fontpath="
|
||||||
|
(assoc-ref %build-inputs "gs-fonts")
|
||||||
|
"/share/fonts/type1/ghostscript"))
|
||||||
|
,flags))))
|
||||||
|
(native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype
|
||||||
|
,@(package-native-inputs ghostscript)))
|
||||||
|
(inputs `(("gs-fonts" ,gs-fonts)
|
||||||
|
("fontconfig" ,fontconfig)
|
||||||
|
,@(package-inputs ghostscript)))))
|
||||||
|
|
||||||
(define-public ghostscript/x
|
(define-public ghostscript/x
|
||||||
(package/inherit ghostscript
|
(package/inherit ghostscript
|
||||||
(name (string-append (package-name ghostscript) "-with-x"))
|
(name (string-append (package-name ghostscript) "-with-x"))
|
||||||
|
|
Loading…
Reference in a new issue