01/06: gnu: Move ghostscript-with-x into (gnu packages ghostscript).

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 7a75b02ae54b054cdc614d1cb5af7ed26c4f63c3
Author: Mark H Weaver <address@hidden>
Date:   Sat Aug 8 13:46:17 2015 -0400

    gnu: Move ghostscript-with-x into (gnu packages ghostscript).
    
    * gnu/packages/gv.scm (ghostscript/x): Move ...
    * gnu/packages/ghostscript.scm (ghostscript/x): ... to here.
---
 gnu/packages/ghostscript.scm |   10 +++++++++-
 gnu/packages/gv.scm          |    7 -------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index bd57889..818072a 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013 Andreas Enge <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2015 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,6 +29,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages tcl)
+  #:use-module (gnu packages xorg)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -183,6 +184,13 @@ output file formats and printers.")
    (license license:agpl3+)
    (home-page "http://www.gnu.org/software/ghostscript/";)))
 
+(define-public ghostscript/x
+  (package (inherit ghostscript)
+    (name (string-append (package-name ghostscript) "-with-x"))
+    (inputs `(("libxext" ,libxext)
+              ("libxt" ,libxt)
+              ,@(package-inputs ghostscript)))))
+
 (define-public ijs
   (package
    (name "ijs")
diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm
index f635942..5f85321 100644
--- a/gnu/packages/gv.scm
+++ b/gnu/packages/gv.scm
@@ -28,13 +28,6 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
 
-(define-public ghostscript/x
-  (package (inherit ghostscript)
-    (name (string-append (package-name ghostscript) "-with-x"))
-    (inputs `(("libxext" ,libxext)
-              ("libxt" ,libxt)
-              ,@(package-inputs ghostscript)))))
-
 (define-public gv
   (package
    (name "gv")