[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/12: gnu: itcl: Use G-expressions.
From: |
guix-commits |
Subject: |
04/12: gnu: itcl: Use G-expressions. |
Date: |
Tue, 4 Jan 2022 23:46:18 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit e662bdc48954deae53dfe4001252425625f587a9
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Jan 4 16:28:55 2022 +0100
gnu: itcl: Use G-expressions.
* gnu/packages/tcl.scm (itcl)[arguments]:
Rewrite as G-expressions.
---
gnu/packages/tcl.scm | 47 ++++++++++++++++++++++-------------------------
1 file changed, 22 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index b2c4094a4b..810095282e 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
@@ -25,6 +25,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages tcl)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -108,30 +109,26 @@
(base32 "0v0m1s3rlsbg7p366i6m5zcvnmixnch87jmczidjanqvmw76fk5c"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list
- (string-append
- "--exec-prefix=" (assoc-ref %outputs "out"))
- (string-append
- "--with-tclinclude=" (assoc-ref %build-inputs "tcl") "/include")
- (string-append
- "--with-tcl=" (assoc-ref %build-inputs "tcl") "/lib"))
- #:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'cleanup-bin-and-lib
- (lambda* (#:key outputs #:allow-other-keys)
- ;; NOTE: (Sharlatan-20210213T204336+0000): libraries appearer in
- ;; "out/lib/itcl{{version}}" and there are no binaries, some extra
- ;; rename and remove spells are to be applied.
- (let ((out (assoc-ref outputs "out")))
- (rmdir
- (string-append out "/bin"))
- (rename-file
- (string-append out "/lib/itcl" ,version) (string-append out
"/libtmp"))
- (rename-file
- (string-append out "/libtmp") (string-append out "/lib")))
- #t)))))
+ (list #:configure-flags
+ #~(list
+ (string-append "--exec-prefix=" #$output)
+ (string-append "--with-tclinclude="
+ (assoc-ref %build-inputs "tcl") "/include")
+ (string-append "--with-tcl="
+ (assoc-ref %build-inputs "tcl") "/lib"))
+ #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'clean-up-bin-and-lib
+ (lambda _
+ ;; NOTE: (Sharlatan-20210213T204336+0000): libraries
appearer in
+ ;; "out/lib/itcl{{version}}" and there are no binaries,
some extra
+ ;; rename and remove spells are to be applied.
+ (rmdir (string-append #$output "/bin"))
+ (rename-file (string-append #$output "/lib/itcl" #$version)
+ (string-append #$output "/libtmp"))
+ (rename-file (string-append #$output "/libtmp")
+ (string-append #$output "/lib")))))))
(native-inputs
(list tcl))
(inputs
- branch master updated (8646f1f7a5 -> 8860e9db56), guix-commits, 2022/01/04
- 04/12: gnu: itcl: Use G-expressions.,
guix-commits <=
- 02/12: gnu: linuxdcpp: Reanimate., guix-commits, 2022/01/04
- 06/12: gnu: moreutils: Update to 0.67., guix-commits, 2022/01/04
- 07/12: gnu: moreutils: Use G-expressions., guix-commits, 2022/01/04
- 10/12: gnu: hangups: Update to 0.4.16., guix-commits, 2022/01/04
- 05/12: gnu: nbd: Update to 3.23., guix-commits, 2022/01/04
- 11/12: gnu: lucene++: Update to 3.0.8., guix-commits, 2022/01/04
- 12/12: gnu: lucene++: Use G-expressions., guix-commits, 2022/01/04
- 03/12: gnu: itcl: Update to 4.2.2., guix-commits, 2022/01/04
- 08/12: gnu: amsynth: Update to 1.12.3., guix-commits, 2022/01/04
- 09/12: gnu: amsynth: Use G-expressions., guix-commits, 2022/01/04