diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
| commit | 61b1df6f2791a2afa291b56708d73a5264ca70eb (patch) | |
| tree | 314ddb96391b25e83e9a31637be0f1a7f52cc249 /gnu/packages/cups.scm | |
| parent | bdb8267680f14ee5d3df9d029f23279c1457c211 (diff) | |
| parent | 4be014128e1c422f37b56f9a6b3420b4e85c4302 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/cups.scm')
| -rw-r--r-- | gnu/packages/cups.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index bbdd89ec08..accfe410ba 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,9 +45,8 @@ ;; Delay to avoid module circularity problems. (define ghostscript/cups (delay - (package (inherit ghostscript) + (package/inherit ghostscript (name "ghostscript-with-cups") - (replacement #f) (inputs `(("cups" ,cups-minimal) ,@(package-inputs ghostscript)))))) |