ocamlPackages.z3: fix build

This commit is contained in:
Vincent Laporte 2022-01-13 15:42:04 +01:00
parent 9afe9ed710
commit 8024b6bcd9
No known key found for this signature in database
GPG key ID: EBD582ADDDB1F81F
2 changed files with 25 additions and 3 deletions

View file

@ -1,9 +1,18 @@
{ stdenv, ocaml, findlib, zarith, z3 }:
{ stdenv, lib, ocaml, findlib, zarith, z3 }:
let z3-with-ocaml = z3.override {
if !lib.versionAtLeast ocaml.version "4.07"
then throw "z3 is not available for OCaml ${ocaml.version}"
else
let z3-with-ocaml = (z3.override {
ocamlBindings = true;
inherit ocaml findlib zarith;
}; in
}).overrideAttrs (o: {
patches = (o.patches or []) ++ [
# Fix build; see: https://github.com/Z3Prover/z3/issues/5776
./ocamlfind.patch
];
}); in
stdenv.mkDerivation {

View file

@ -0,0 +1,13 @@
diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index 042e6af46..1e105b002 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -1995,7 +1995,7 @@ class MLComponent(Component):
LIBZ3 = LIBZ3 + ' ' + ' '.join(map(lambda x: '-cclib ' + x, LDFLAGS.split()))
- stubs_install_path = '$$(%s printconf path)/stublibs' % OCAMLFIND
+ stubs_install_path = '$$(%s printconf destdir)/stublibs' % OCAMLFIND
if not STATIC_LIB:
loadpath = '-ccopt -L' + stubs_install_path
dllpath = '-dllpath ' + stubs_install_path