03/03: gnu: ghostscript: Fix grafting of ghostscript/x and ghostscript/cups.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 7020a6ab8b8678e148d01814fa8c750743681c4e
Author: Mark H Weaver <address@hidden>
Date:   Tue May 2 03:41:24 2017 -0400

    gnu: ghostscript: Fix grafting of ghostscript/x and ghostscript/cups.
    
    * gnu/packages/cups.scm (ghostscript/cups): Use package/inherit.
    * gnu/packages/ghostscript.scm (ghostscript/x): Use package/inherit.
    (ghostscript/fixed)[replacement]: Override to #f.
---
 gnu/packages/cups.scm        | 4 ++--
 gnu/packages/ghostscript.scm | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index bbdd89e..accfe41 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Danny Milosavljevic <address@hidden>
 ;;; Copyright © 2017 Leo Famulari <address@hidden>
+;;; Copyright © 2017 Mark H Weaver <address@hidden>
 ;;;
 ;;; 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))))))
 
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 5340107..4e8736c 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <address@hidden>
-;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2017 Alex Vong <address@hidden>
@@ -209,8 +209,7 @@ output file formats and printers.")
    (properties '((upstream-name . "gnu-ghostscript")))))
 
 (define-public ghostscript/x
-  (package (inherit ghostscript)
-    (replacement #f)
+  (package/inherit ghostscript
     (name (string-append (package-name ghostscript) "-with-x"))
     (inputs `(("libxext" ,libxext)
               ("libxt" ,libxt)
@@ -219,6 +218,7 @@ output file formats and printers.")
 (define ghostscript/fixed
   (package
     (inherit ghostscript)
+    (replacement #f)
     (source
       (origin
         (inherit (package-source ghostscript))