nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-10 15:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145630 from marsam/fix-acl2-darwin

Browse Source 
acl2: fix build on darwin
This commit is contained in:
Domen Kožar 2021-11-12 18:07:39 -06:00 committed by GitHub
commit 47036da610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ index e5db28645..65eb818a1 100644
- "libcrypto.dylib" ;; default system libcrypto, which may have insufficient crypto - "libcrypto.dylib" ;; default system libcrypto, which may have insufficient crypto
- "/usr/lib/libcrypto.dylib")) - "/usr/lib/libcrypto.dylib"))
- (:cygwin (:or "cygcrypto-1.1.dll" "cygcrypto-1.0.0.dll"))) - (:cygwin (:or "cygcrypto-1.1.dll" "cygcrypto-1.0.0.dll")))
+ (t "@openssl@/lib/libcrypto.so")) + (t "@libcrypto@"))
(cffi:define-foreign-library libssl (cffi:define-foreign-library libssl
- (:windows (:or #+(and windows x86-64) "libssl-1_1-x64.dll" - (:windows (:or #+(and windows x86-64) "libssl-1_1-x64.dll"
@ -145,7 +145,7 @@ index e5db28645..65eb818a1 100644
- "libssl.so")) - "libssl.so"))
- (:cygwin (:or "cygssl-1.1.dll" "cygssl-1.0.0.dll")) - (:cygwin (:or "cygssl-1.1.dll" "cygssl-1.0.0.dll"))
- (t (:default "libssl3"))) - (t (:default "libssl3")))
+ (t "@openssl@/lib/libssl.so")) + (t "@libssl@"))
(unless (member :cl+ssl-foreign-libs-already-loaded (unless (member :cl+ssl-foreign-libs-already-loaded
*features*) *features*)

7
pkgs/development/interpreters/acl2/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll { lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll
, sbcl, bash, which, perl, nettools , sbcl, bash, which, perl, hostname
, openssl, glucose, minisat, abc-verifier, z3, python , openssl, glucose, minisat, abc-verifier, z3, python
, certifyBooks ? true , certifyBooks ? true
} @ args: } @ args:
@ -36,7 +36,8 @@ in stdenv.mkDerivation rec {
patches = [(substituteAll { patches = [(substituteAll {
src = ./0001-Fix-some-paths-for-Nix-build.patch; src = ./0001-Fix-some-paths-for-Nix-build.patch;
libipasir = "${libipasir}/lib/${libipasir.libname}"; 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 = [ buildInputs = [
@ -44,7 +45,7 @@ in stdenv.mkDerivation rec {
sbcl sbcl
] ++ lib.optionals certifyBooks [ ] ++ lib.optionals certifyBooks [
# To build community books, we need Perl and a couple of utilities: # 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: # Some of the books require one or more of these external tools:
openssl.out glucose minisat abc-verifier libipasir openssl.out glucose minisat abc-verifier libipasir
z3 (python.withPackages (ps: [ ps.z3 ])) z3 (python.withPackages (ps: [ ps.z3 ]))