nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: tcl: Use invoke. 

* gnu/packages/tcl.scm (tcl)[arguments]: Use invoke and remove vestigial
plumbing in the 'install-private-headers' phase.
This commit is contained in:
Mark H Weaver 2018-03-23 03:51:50 -04:00
parent 6d0f261237
commit 6fea8adec9
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/tcl.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
@ -55,16 +55,15 @@
(add-after 'install 'install-private-headers (add-after 'install 'install-private-headers
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Private headers are needed by Expect. ;; Private headers are needed by Expect.
(and (zero? (system* "make" (invoke "make" "install-private-headers")
"install-private-headers")) (let ((bin (string-append (assoc-ref outputs "out")
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
"/bin"))) ;; Create a tclsh -> tclsh8.6 symlink.
;; Create a tclsh -> tclsh8.6 symlink. ;; Programs such as Ghostscript rely on it.
;; Programs such as Ghostscript rely on it. (with-directory-excursion bin
(with-directory-excursion bin (symlink (car (find-files "." "tclsh"))
(symlink (car (find-files "." "tclsh")) "tclsh"))
"tclsh")) #t))))
#t)))))
;; By default, man pages are put in PREFIX/man, but we want them in ;; By default, man pages are put in PREFIX/man, but we want them in
;; PREFIX/share/man. The 'validate-documentation-location' phase is ;; PREFIX/share/man. The 'validate-documentation-location' phase is