ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* gnu/packages/cups.scm (ghostscript/cups): Use package/inherit.
* gnu/packages/ghostscript.scm (ghostscript/x): Use package/inherit.
(ghostscript/fixed)[replacement]: Override to #f.
This commit is contained in:
Mark H Weaver 2017-05-02 03:41:24 -04:00
parent bedba06426
commit 7020a6ab8b
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/cups.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -44,9 +45,8 @@ (define-module (gnu packages cups)
;; Delay to avoid module circularity problems. ;; Delay to avoid module circularity problems.
(define ghostscript/cups (define ghostscript/cups
(delay (delay
(package (inherit ghostscript) (package/inherit ghostscript
(name "ghostscript-with-cups") (name "ghostscript-with-cups")
(replacement #f)
(inputs `(("cups" ,cups-minimal) (inputs `(("cups" ,cups-minimal)
,@(package-inputs ghostscript)))))) ,@(package-inputs ghostscript))))))

6
gnu/packages/ghostscript.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
@ -209,8 +209,7 @@ (define-public ghostscript
(properties '((upstream-name . "gnu-ghostscript"))))) (properties '((upstream-name . "gnu-ghostscript")))))
(define-public ghostscript/x (define-public ghostscript/x
(package (inherit ghostscript) (package/inherit ghostscript
(replacement #f)
(name (string-append (package-name ghostscript) "-with-x")) (name (string-append (package-name ghostscript) "-with-x"))
(inputs `(("libxext" ,libxext) (inputs `(("libxext" ,libxext)
("libxt" ,libxt) ("libxt" ,libxt)
@ -219,6 +218,7 @@ (define-public ghostscript/x
(define ghostscript/fixed (define ghostscript/fixed
(package (package
(inherit ghostscript) (inherit ghostscript)
(replacement #f)
(source (source
(origin (origin
(inherit (package-source ghostscript)) (inherit (package-source ghostscript))