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

* gnu/packages/gv.scm (ghostscript/x): Move ...
* gnu/packages/ghostscript.scm (ghostscript/x): ... to here.
This commit is contained in:
Mark H Weaver 2015-08-08 13:46:17 -04:00
parent 831bc1468e
commit 7a75b02ae5
2 changed files with 9 additions and 8 deletions

View file

@ -2,7 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -29,6 +29,7 @@ (define-module (gnu packages ghostscript)
#: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 @@ (define-public ghostscript
(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")

View file

@ -28,13 +28,6 @@ (define-module (gnu packages gv)
#: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")