diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
commit | 4e5e05d40908e9f1336ffc5a6c4928ab61ad034c (patch) | |
tree | ad6d6be0ece396ba3353871a5691e514253508f8 /gnu/packages/lisp-xyz.scm | |
parent | 2c400ae94207b3b84fcdcaa21c122076c050d307 (diff) | |
parent | e1fa3ea9fe8d01dd124c5e304bde9243876378ba (diff) | |
download | guix-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/lisp-xyz.scm')
-rw-r--r-- | gnu/packages/lisp-xyz.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 063c88210c..776865f178 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> @@ -2192,6 +2192,12 @@ non-consing thread safe queues and fibonacci priority queues.") (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-arm-support + (lambda _ + ;; This is apparently deprecated since libffi-3.3. + (substitute* "libffi/libffi-types.lisp" + (("\\\(\\\(:unix64.*") ")\n")) + #t)) (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "libffi/libffi.lisp" |