pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch

   1 From aed1c4b0be7576d20eed81070da2c6f92573df18 Mon Sep 17 00:00:00 2001
   2 From: Keshav Kini <keshav.kini@gmail.com>
   3 Date: Sat, 30 May 2020 21:27:47 -0700
   4 Subject: [PATCH] Fix some paths for Nix build
   5
   6 ---
   7  books/build/features.sh                                     | 1 +
   8  books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp          | 6 +-----
   9  .../bundle/software/cl+ssl-20220707-git/src/reload.lisp     | 3 +++
  10  3 files changed, 5 insertions(+), 5 deletions(-)
  11
  12 diff --git a/books/build/features.sh b/books/build/features.sh
  13 index feb5b2b59c..4b654e08bc 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
  24 diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp
  25 index 762e4ad4c0..c9802cb582 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))))
  41 diff --git a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
  42 index d409b4440f..5c65c5b4da 100644
  43 --- a/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
  44 +++ b/books/quicklisp/bundle/software/cl+ssl-20220707-git/src/reload.lisp
  45 @@ -87,6 +87,9 @@ sudo rm /usr/local/lib/libcrypto.dylib /usr/local/lib/libssl.dylib
  46  ;;
  47  ;; These are 32-bit only.
  48
  49 +(cl+ssl/config:define-libssl-path "@libssl@")
  50 +(cl+ssl/config:define-libcrypto-path "@libcrypto@")
  51 +
  52  (unless cl+ssl/config::*libcrypto-override*
  53    (cffi:define-foreign-library libcrypto
  54      (:windows (:or #+(and windows x86-64) "libcrypto-1_1-x64.dll"
  55 --
  56 2.31.1
  57