From 3e442f85fdbb5a0f8b7499010bf1c2c34a27f592 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 5 Dec 2017 17:49:48 +0100
Subject: 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.
---
 gnu/packages/cups.scm        | 10 +---------
 gnu/packages/ghostscript.scm |  7 +++++++
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'gnu/packages')

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 @@ (define-module (gnu packages cups)
   #: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 @@ (define-public cups-filters
        ("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 @@ (define-module (gnu packages ghostscript)
   #: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 @@ (define-public ghostscript/x
               ("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")
-- 
cgit v1.2.3