tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From 2c7829aec41f6915bda2a23af57f0b39b075a70b Mon Sep 17 00:00:00 2001
2From: C4 Patino <c4patino@gmail.com>
3Date: Wed, 3 Sep 2025 22:43:05 -0500
4Subject: [PATCH] path changes for nix
5
6---
7 books/build/features.sh | 1 +
8 books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp | 6 +-----
9 .../bundle/software/cl+ssl-20231021-git/src/reload.lisp | 2 ++
10 3 files changed, 4 insertions(+), 5 deletions(-)
11
12diff --git a/books/build/features.sh b/books/build/features.sh
13index 20ef1f1cc7..e8a16396e3 100755
14--- a/books/build/features.sh
15+++ b/books/build/features.sh
16@@ -125,6 +125,7 @@ EOF
17 fi
18
19 echo "Determining whether an ipasir shared library is installed" 1>&2
20+IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasir@}
21 if check_ipasir; then
22 cat >> Makefile-features <<EOF
23 export OS_HAS_IPASIR ?= 1
24diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
25index 762e4ad4c0..abc95d0ad8 100644
26--- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
27+++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
28@@ -30,11 +30,7 @@
29
30 (er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*)))
31 (handler-case
32- (cffi::load-foreign-library
33- (or libname
34- (cw "WARNING: $IPASIR_SHARED_LIBRARY not specified, ~
35- defaulting to \"libipasirglucose4.so\"")
36- "libipasirglucose4.so"))
37+(cffi::load-foreign-library (or libname "@libipasir@"))
38 (error () (er hard? 'load-ipasir-shardlib-raw
39 "Couldn't load ipasir shared library from ~s0."
40 libname))))
41diff --git a/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp
42index 05ab8837d0..fb60937580 100644
43--- a/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp
44+++ b/books/quicklisp/bundle/software/cl+ssl-20231021-git/src/reload.lisp
45@@ -14,6 +14,8 @@
46 ;;; put this directly into ffi.lisp
47
48 (in-package :cl+ssl)
49+(cl+ssl/config:define-libssl-path "@libssl@")
50+(cl+ssl/config:define-libcrypto-path "@libcrypto@")
51
52 ;; The default OS-X libssl seems have had insufficient crypto algos
53 ;; (missing TLSv1_[1,2]_XXX methods,
54--
552.50.1
56