diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-25 11:37:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-25 11:37:43 +0200 |
| commit | d8eb912132ccdff955e3318fe549c5f7f674adf8 (patch) | |
| tree | fcbe8c32284f2ad9499fe9c01da3fd6a1996eb2c | |
| parent | 71eba3ebc1b37b1623ad1cf29fadd711adafc043 (diff) | |
| download | guix-d8eb912132ccdff955e3318fe549c5f7f674adf8.tar guix-d8eb912132ccdff955e3318fe549c5f7f674adf8.tar.gz | |
gnu: Use 'ghostscript-gs' in packages that need the 'gs' command.
Fixes a regression introduced in
eb354bdacbf4154ec66038dac07f19bf4ced1fad.
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.
| -rw-r--r-- | gnu/packages/gv.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/ocaml.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/plotutils.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/scheme.scm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm index 5f8532144b..240e3fc96c 100644 --- a/gnu/packages/gv.scm +++ b/gnu/packages/gv.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; @@ -39,7 +39,7 @@ (sha256 (base32 "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1")))) (build-system gnu-build-system) - (propagated-inputs `(("ghostscript" ,ghostscript/x))) + (propagated-inputs `(("ghostscript" ,ghostscript-gs/x))) (inputs `(("libx11" ,libx11) ("libxaw3d" ,libxaw3d) ("libxinerama" ,libxinerama) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5d73790e51..75da9dad20 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -404,7 +404,7 @@ interface. It is implemented as a frontend to @code{klick}.") ("font-tex-gyre" ,font-tex-gyre) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("ghostscript" ,ghostscript) + ("ghostscript" ,ghostscript-gs) ("pango" ,pango) ("python" ,python-2))) (native-inputs diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bd913f6ecd..074f830358 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -569,7 +569,7 @@ libpanel, librsvg and quartz.") (native-inputs `(("ocaml" ,ocaml) ;; For documentation - ("ghostscript" ,ghostscript) + ("ghostscript" ,ghostscript-gs) ("texlive" ,texlive) ("hevea" ,hevea) ("lynx" ,lynx))) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 74d209192f..26864dc317 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -186,7 +186,7 @@ colors, styles, options and details.") ;; "help" command in interactive mode, so adding a "doc" output is not ;; currently useful. (native-inputs - `(("gs" ,ghostscript) ;For tests + `(("gs" ,ghostscript-gs) ;For tests ("texinfo" ,texinfo) ;For generating documentation ("texlive" ,texlive) ;For tests and documentation ("emacs" ,emacs-minimal) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 373b6f37b3..797cd153d2 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -635,7 +635,7 @@ threads.") ("stex" ,stex))) (native-inputs `(("texlive" ,texlive) - ("ghostscript" ,ghostscript) + ("ghostscript" ,ghostscript-gs) ("netpbm" ,netpbm))) (outputs '("out" "doc")) (arguments |