diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
| commit | 9e111db4535b3cd5729e37294ae51d95240334b4 (patch) | |
| tree | cc90a9de80ff39bd93426b763918d904abfeeb56 /gnu/packages/cups.scm | |
| parent | 92b61d3e1bb50f0c1d087bc8d57cc00c3ce360df (diff) | |
| parent | cf69135d5e6797e566b8bb18419ae9e3c8aeb621 (diff) | |
| download | guix-9e111db4535b3cd5729e37294ae51d95240334b4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/cups.scm')
| -rw-r--r-- | gnu/packages/cups.scm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 4cb76b9181..bb2b88d9ff 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -47,14 +47,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") @@ -147,7 +139,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) |