diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-12-05 17:49:48 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-05 17:49:48 +0100 |
| commit | 3e442f85fdbb5a0f8b7499010bf1c2c34a27f592 (patch) | |
| tree | a23f5d647ed4e4326ab2e8220374539a70466feb | |
| parent | 91c9b5d016ac8bed127557d378c70fbc56cec0e5 (diff) | |
| download | guix-3e442f85fdbb5a0f8b7499010bf1c2c34a27f592.tar.gz | |
gnu: ghostscript-with-cups: Turn into a public variable.
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.
| -rw-r--r-- | gnu/packages/cups.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/ghostscript.scm | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index bbf2699f00..e3a252bc0c 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -46,14 +46,6 @@ #:use-module (gnu packages pkg-config) #: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 (package (name "cups-filters") @@ -146,7 +138,7 @@ ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("font-dejavu" ,font-dejavu) ; also needed by test suite - ("ghostscript" ,(force ghostscript/cups)) + ("ghostscript" ,ghostscript/cups) ("ijs" ,ijs) ("dbus" ,dbus) ("lcms" ,lcms) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 28477b2c42..f0a28d0752 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages cups) #:use-module (gnu packages fontutils) #:use-module (gnu packages image) #:use-module (gnu packages perl) @@ -281,6 +282,12 @@ output file formats and printers.") ("libxt" ,libxt) ,@(package-inputs ghostscript))))) +(define-public ghostscript/cups + (package/inherit ghostscript + (name "ghostscript-with-cups") + (inputs `(("cups" ,cups-minimal) + ,@(package-inputs ghostscript))))) + (define-public ijs (package (name "ijs") |