diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-11-12 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2021-11-12 04:20:00 +0000 |
| commit | 21aea16159a228fd86c4af2ee8b50091a607811b (patch) | |
| tree | 72b0a0c3d96fd5cc0b7ef415dd1b77061421399e /pkgs/development/interpreters | |
| parent | 8d85dc628f899db1f7899e16fa1ddf8e03936ee2 (diff) | |
| download | nixpkgs-21aea16159a228fd86c4af2ee8b50091a607811b.tar nixpkgs-21aea16159a228fd86c4af2ee8b50091a607811b.tar.gz nixpkgs-21aea16159a228fd86c4af2ee8b50091a607811b.tar.bz2 nixpkgs-21aea16159a228fd86c4af2ee8b50091a607811b.tar.lz nixpkgs-21aea16159a228fd86c4af2ee8b50091a607811b.tar.xz nixpkgs-21aea16159a228fd86c4af2ee8b50091a607811b.tar.zst nixpkgs-21aea16159a228fd86c4af2ee8b50091a607811b.zip | |
acl2: fix build on darwin
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/acl2/default.nix | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch b/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch index ac107414a92..7726f17b41e 100644 --- a/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch +++ b/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch @@ -102,7 +102,7 @@ index e5db28645..65eb818a1 100644 - "libcrypto.dylib" ;; default system libcrypto, which may have insufficient crypto - "/usr/lib/libcrypto.dylib")) - (:cygwin (:or "cygcrypto-1.1.dll" "cygcrypto-1.0.0.dll"))) -+ (t "@openssl@/lib/libcrypto.so")) ++ (t "@libcrypto@")) (cffi:define-foreign-library libssl - (:windows (:or #+(and windows x86-64) "libssl-1_1-x64.dll" @@ -145,7 +145,7 @@ index e5db28645..65eb818a1 100644 - "libssl.so")) - (:cygwin (:or "cygssl-1.1.dll" "cygssl-1.0.0.dll")) - (t (:default "libssl3"))) -+ (t "@openssl@/lib/libssl.so")) ++ (t "@libssl@")) (unless (member :cl+ssl-foreign-libs-already-loaded *features*) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 9436cf58e42..a1b59b8bf69 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll -, sbcl, bash, which, perl, nettools +, sbcl, bash, which, perl, hostname , openssl, glucose, minisat, abc-verifier, z3, python , certifyBooks ? true } @ args: @@ -36,7 +36,8 @@ in stdenv.mkDerivation rec { patches = [(substituteAll { src = ./0001-Fix-some-paths-for-Nix-build.patch; libipasir = "${libipasir}/lib/${libipasir.libname}"; - openssl = openssl.out; + libssl = "${openssl.out}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}"; + libcrypto = "${openssl.out}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; })]; buildInputs = [ @@ -44,7 +45,7 @@ in stdenv.mkDerivation rec { sbcl ] ++ lib.optionals certifyBooks [ # To build community books, we need Perl and a couple of utilities: - which perl nettools makeWrapper + which perl hostname makeWrapper # Some of the books require one or more of these external tools: openssl.out glucose minisat abc-verifier libipasir z3 (python.withPackages (ps: [ ps.z3 ])) |