From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f68rV-0003a6-BN for guix-patches@gnu.org; Wed, 11 Apr 2018 02:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f68rS-0000k3-GJ for guix-patches@gnu.org; Wed, 11 Apr 2018 02:04:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37725) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f68rS-0000js-DF for guix-patches@gnu.org; Wed, 11 Apr 2018 02:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f68rS-0006vD-4l for guix-patches@gnu.org; Wed, 11 Apr 2018 02:04:02 -0400 Subject: [bug#31123] [PATCH 1/2] gnu: texlive-bin: Use ghostscript executable "gs" in ps2eps. References: <20180411055919.27684-1-arunisaac@systemreboot.net> In-Reply-To: <20180411055919.27684-1-arunisaac@systemreboot.net> Resent-Message-ID: From: Arun Isaac Date: Wed, 11 Apr 2018 11:33:12 +0530 Message-Id: <20180411060313.27912-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31123@debbugs.gnu.org * gnu/packages/tex.scm (texlive-bin)[arguments]: Add fix-unix-detection phase. Replace system* with invoke in postint phase. --- gnu/packages/tex.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index db1f120ce..2b35250dd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -175,6 +176,15 @@ (string-prefix? "mips64" s)))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-unix-detection + ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, + ;; and the "gs" ghostscript executable on Unix. It detects Unix by + ;; checking for the existence of the /usr/bin directory. Since + ;; GuixSD does not have /usr/bin, it is also detected as Windows. + (lambda _ + (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" + (("gswin32c") "gs")) + #t)) (add-after 'install 'postint (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) (let* ((out (assoc-ref outputs "out")) @@ -196,7 +206,7 @@ (with-directory-excursion "texlive-extra" (apply unpack (list #:source texlive-extra)) (apply patch-source-shebangs (list #:source texlive-extra)) - (system* "mv" "tlpkg" share)))))))) + (invoke "mv" "tlpkg" share)))))))) (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. -- 2.15.1