diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/smalltalk.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.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")))) |