summaryrefslogtreecommitdiff
path: root/gnu/packages/lisp-xyz.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-05-08 21:40:51 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-05-08 21:40:51 +0200
commit4bdf4182fe080c3409f6ef9b410146b67cfa2595 (patch)
treef1123ddb8c57eda6de026982904f6c5309adaca6 /gnu/packages/lisp-xyz.scm
parentc81457a5883ea43950eb2ecdcbb58a5b144bcd11 (diff)
parent23a59b180b28b9fa22120c2b8305b9324442b94d (diff)
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/lisp-xyz.scm')
-rw-r--r--gnu/packages/lisp-xyz.scm14
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 4f406ded66..d0a0065957 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -2542,7 +2542,7 @@ non-consing thread safe queues and fibonacci priority queues.")
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "libffi/libffi.lisp"
- (("libffi.so.6" all) (string-append
+ (("libffi.so.7" all) (string-append
(assoc-ref inputs "libffi")
"/lib/" all)))
(substitute* "toolchain/c-toolchain.lisp"
@@ -5210,11 +5210,17 @@ high-level way. This library provides such operators.")
(let ((python (assoc-ref inputs "python")))
(setenv "BB_PYTHON3_INCLUDE_DIR"
(string-append python "/include/python"
- (python-version python)
- "m"))
+ (python-version python)))
(setenv "BB_PYTHON3_DYLIB"
(string-append python "/lib/libpython3.so"))
- #t))))))
+ #t)))
+ (add-after 'unpack 'adjust-for-python-3.8
+ (lambda _
+ ;; This method is no longer part of the public API.
+ (substitute* "ffi-interface.lisp"
+ ((".*PyEval_ReInitThreads.*")
+ ""))
+ #t)))))
(native-inputs
`(("sbcl-cl-fad" ,sbcl-cl-fad)
("sbcl-lift" ,sbcl-lift)