diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/smalltalk.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/smalltalk.scm')
| -rw-r--r-- | gnu/packages/smalltalk.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index ea1798ac13..26f7ab2c76 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,7 +65,8 @@ ;; XXX: To be removed with the next release of Smalltalk. ("autoconf" ,autoconf) ("automake" ,automake) - ("libtool" ,libtool))) + ("libtool" ,libtool) + ("zip" ,zip))) ;; TODO: These optional dependencies raise the closure size to ~1 GiB ;; from the current ~100 MiB, although some of them might be very ;; useful for end users: @@ -81,8 +83,7 @@ ("libffi" ,libffi) ("libltdl" ,libltdl) ("libsigsegv" ,libsigsegv) - ("lightning" ,lightning) - ("zip" ,zip))) + ("lightning" ,lightning))) (arguments `(#:phases (modify-phases %standard-phases @@ -102,8 +103,12 @@ (find-files "doc" "\\.info")) #t)) (add-before 'configure 'fix-libc - (lambda _ - (let ((libc (assoc-ref %build-inputs "libc"))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (or (assoc-ref inputs "libc") + ;; When cross-compiling, the input + ;; is named "cross-libc" instead of + ;; simply "libc". + (assoc-ref inputs "cross-libc")))) (substitute* "libc.la.in" (("@LIBC_SO_NAME@") "libc.so") (("@LIBC_SO_DIR@") (string-append libc "/lib")))) |