From fbec5abeef78ee52a56e3cd2183fd34baec47773 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 5 Jan 2017 22:59:22 +0100 Subject: gnu: gv: Do not propagate Ghostscript. * gnu/packages/gv.scm (gv)[propagated-inputs]: Remove. [arguments]: New field. [inputs]: Add GHOSTCRIPT/X. --- gnu/packages/gv.scm | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm index e1e86a83a6..446b2946b5 100644 --- a/gnu/packages/gv.scm +++ b/gnu/packages/gv.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2013, 2016 Ludovic Courtès +;;; Copyright © 2013, 2016, 2017 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -40,8 +40,25 @@ (define-public gv (sha256 (base32 "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1")))) (build-system gnu-build-system) - (propagated-inputs `(("ghostscript" ,ghostscript/x))) - (inputs `(("libx11" ,libx11) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-gs-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Set the value of 'GV.gsInterpreter' in the generated + ;; 'gv_system.ad' file. + (let ((gs (assoc-ref inputs "ghostscript"))) + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* "src/Makefile.in" + (("GV\\.gsInterpreter:([[:blank:]]+)gs" _ blank) + (string-append "GV.gsInterpreter:" blank + gs "/bin/gs")) + (("GV\\.gsCmd([[:alpha:]]+):([[:blank:]]+)gs" _ + command blank) + (string-append "GV.gsCmd" command ":" + blank gs "/bin/gs")))) + #t)))))) + (inputs `(("ghostscript" ,ghostscript/x) + ("libx11" ,libx11) ("libxaw3d" ,libxaw3d) ("libxinerama" ,libxinerama) ("libxpm" ,libxpm) -- cgit v1.2.3