gnu: Use 'ghostscript-gs' in packages that need the 'gs' command.
Fixes a regression introduced in
eb354bdacb
.
Reported by Andreas Enge <andreas@enge.fr>.
* gnu/packages/gv.scm (gv)[propagated-inputs]: Change from GHOSTSCRIPT/X
to GHOSTSCRIPT-GS/X.
* gnu/packages/music.scm (lilypond): Use GHOSTSCRIPT-GS instead of
GHOSTSCRIPT.
* gnu/packages/ocaml.scm (unison): Likewise.
* gnu/packages/plotutils.scm (asymptote): Likewise.
* gnu/packages/scheme.scm (chez-scheme): Likewise.
This commit is contained in:
parent
71eba3ebc1
commit
d8eb912132
|
@ -1,6 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
(sha256 (base32
|
(sha256 (base32
|
||||||
"0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"))))
|
"0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(propagated-inputs `(("ghostscript" ,ghostscript/x)))
|
(propagated-inputs `(("ghostscript" ,ghostscript-gs/x)))
|
||||||
(inputs `(("libx11" ,libx11)
|
(inputs `(("libx11" ,libx11)
|
||||||
("libxaw3d" ,libxaw3d)
|
("libxaw3d" ,libxaw3d)
|
||||||
("libxinerama" ,libxinerama)
|
("libxinerama" ,libxinerama)
|
||||||
|
|
|
@ -404,7 +404,7 @@ interface. It is implemented as a frontend to @code{klick}.")
|
||||||
("font-tex-gyre" ,font-tex-gyre)
|
("font-tex-gyre" ,font-tex-gyre)
|
||||||
("fontconfig" ,fontconfig)
|
("fontconfig" ,fontconfig)
|
||||||
("freetype" ,freetype)
|
("freetype" ,freetype)
|
||||||
("ghostscript" ,ghostscript)
|
("ghostscript" ,ghostscript-gs)
|
||||||
("pango" ,pango)
|
("pango" ,pango)
|
||||||
("python" ,python-2)))
|
("python" ,python-2)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
|
|
@ -569,7 +569,7 @@ libpanel, librsvg and quartz.")
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("ocaml" ,ocaml)
|
`(("ocaml" ,ocaml)
|
||||||
;; For documentation
|
;; For documentation
|
||||||
("ghostscript" ,ghostscript)
|
("ghostscript" ,ghostscript-gs)
|
||||||
("texlive" ,texlive)
|
("texlive" ,texlive)
|
||||||
("hevea" ,hevea)
|
("hevea" ,hevea)
|
||||||
("lynx" ,lynx)))
|
("lynx" ,lynx)))
|
||||||
|
|
|
@ -186,7 +186,7 @@ colors, styles, options and details.")
|
||||||
;; "help" command in interactive mode, so adding a "doc" output is not
|
;; "help" command in interactive mode, so adding a "doc" output is not
|
||||||
;; currently useful.
|
;; currently useful.
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gs" ,ghostscript) ;For tests
|
`(("gs" ,ghostscript-gs) ;For tests
|
||||||
("texinfo" ,texinfo) ;For generating documentation
|
("texinfo" ,texinfo) ;For generating documentation
|
||||||
("texlive" ,texlive) ;For tests and documentation
|
("texlive" ,texlive) ;For tests and documentation
|
||||||
("emacs" ,emacs-minimal)
|
("emacs" ,emacs-minimal)
|
||||||
|
|
|
@ -635,7 +635,7 @@ threads.")
|
||||||
("stex" ,stex)))
|
("stex" ,stex)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("texlive" ,texlive)
|
`(("texlive" ,texlive)
|
||||||
("ghostscript" ,ghostscript)
|
("ghostscript" ,ghostscript-gs)
|
||||||
("netpbm" ,netpbm)))
|
("netpbm" ,netpbm)))
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
Loading…
Reference in New Issue