mhw pushed a commit to branch core-updates
in repository guix.
commit 6fea8adec913f29e20acc50b6e2f24341790ce50
Author: Mark H Weaver <[email protected]>
Date: Fri Mar 23 03:51:50 2018 -0400
gnu: tcl: Use invoke.
* gnu/packages/tcl.scm (tcl)[arguments]: Use invoke and remove vestigial
plumbing in the 'install-private-headers' phase.
---
gnu/packages/tcl.scm | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 19b2bbf..ef78e57 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <[email protected]>
-;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]>
+;;; Copyright © 2014, 2015, 2018 Mark H Weaver <[email protected]>
;;; Copyright © 2014 Eric Bavier <[email protected]>
;;; Copyright © 2016 Efraim Flashner <[email protected]>
;;; Copyright © 2016 Jan Nieuwenhuizen <[email protected]>
@@ -55,16 +55,15 @@
(add-after 'install 'install-private-headers
(lambda* (#:key outputs #:allow-other-keys)
;; Private headers are needed by Expect.
- (and (zero? (system* "make"
- "install-private-headers"))
- (let ((bin (string-append (assoc-ref outputs "out")
- "/bin")))
- ;; Create a tclsh -> tclsh8.6 symlink.
- ;; Programs such as Ghostscript rely on it.
- (with-directory-excursion bin
- (symlink (car (find-files "." "tclsh"))
- "tclsh"))
- #t)))))
+ (invoke "make" "install-private-headers")
+ (let ((bin (string-append (assoc-ref outputs "out")
+ "/bin")))
+ ;; Create a tclsh -> tclsh8.6 symlink.
+ ;; Programs such as Ghostscript rely on it.
+ (with-directory-excursion bin
+ (symlink (car (find-files "." "tclsh"))
+ "tclsh"))
+ #t))))
;; By default, man pages are put in PREFIX/man, but we want them in
;; PREFIX/share/man. The 'validate-documentation-location' phase is
