ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ghostscript-with-cups: Turn into a public variable.

Browse source 
Tris allows Hydra/Cuirass to pick it up and to build its replacement.
Failing that, users have to build "ghostscript-with-cups-9.22" from
source.

* gnu/packages/cups.scm (ghostscript/cups): Move to 'ghostscript.scm'.
(cups-filters)[inputs]: Remove 'force'.
* gnu/packages/ghostscript.scm (ghostscript/cups): New variable.
This commit is contained in:
Ludovic Courtès 2017-12-05 17:49:48 +01:00
parent 91c9b5d016
commit 3e442f85fd
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/cups.scm
View file

@ -46,14 +46,6 @@ (define-module (gnu packages cups)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)) #:use-module (gnu packages tls))
;; Delay to avoid module circularity problems.
(define ghostscript/cups
(delay
(package/inherit ghostscript
(name "ghostscript-with-cups")
(inputs `(("cups" ,cups-minimal)
,@(package-inputs ghostscript))))))
(define-public cups-filters (define-public cups-filters
(package (package
(name "cups-filters") (name "cups-filters")
@ -146,7 +138,7 @@ (define-public cups-filters
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("font-dejavu" ,font-dejavu) ; also needed by test suite ("font-dejavu" ,font-dejavu) ; also needed by test suite
("ghostscript" ,(force ghostscript/cups)) ("ghostscript" ,ghostscript/cups)
("ijs" ,ijs) ("ijs" ,ijs)
("dbus" ,dbus) ("dbus" ,dbus)
("lcms" ,lcms) ("lcms" ,lcms)

7
gnu/packages/ghostscript.scm
View file

@ -26,6 +26,7 @@ (define-module (gnu packages ghostscript)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cups)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -281,6 +282,12 @@ (define-public ghostscript/x
("libxt" ,libxt) ("libxt" ,libxt)
,@(package-inputs ghostscript))))) ,@(package-inputs ghostscript)))))
(define-public ghostscript/cups
(package/inherit ghostscript
(name "ghostscript-with-cups")
(inputs `(("cups" ,cups-minimal)
,@(package-inputs ghostscript)))))
(define-public ijs (define-public ijs
(package (package
(name "ijs") (name "ijs")