~ruther/guix-local

7a75b02ae54b054cdc614d1cb5af7ed26c4f63c3 — Mark H Weaver 10 years ago 831bc14
gnu: Move ghostscript-with-x into (gnu packages ghostscript).

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

M gnu/packages/ghostscript.scm
M gnu/packages/gv.scm
M gnu/packages/ghostscript.scm => gnu/packages/ghostscript.scm +9 -1
@@ 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 @@
  #: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")

M gnu/packages/gv.scm => gnu/packages/gv.scm +0 -7
@@ 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")