diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-04-23 09:21:44 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-04-23 09:21:44 -0500 |
commit | 44da3f6522cdd54f7a4663334ce03ac2b1040fc6 (patch) | |
tree | 64de22d980ee513e0baba4ad7047e79c1dd6da11 /pkgs/development | |
parent | d6db31a7205ada37e7141e3b1a1f3099f3302854 (diff) | |
download | nixlib-44da3f6522cdd54f7a4663334ce03ac2b1040fc6.tar nixlib-44da3f6522cdd54f7a4663334ce03ac2b1040fc6.tar.gz nixlib-44da3f6522cdd54f7a4663334ce03ac2b1040fc6.tar.bz2 nixlib-44da3f6522cdd54f7a4663334ce03ac2b1040fc6.tar.lz nixlib-44da3f6522cdd54f7a4663334ce03ac2b1040fc6.tar.xz nixlib-44da3f6522cdd54f7a4663334ce03ac2b1040fc6.tar.zst nixlib-44da3f6522cdd54f7a4663334ce03ac2b1040fc6.zip |
Revert "ocamlPackages.zarith: 1.7 -> 1.8"
This reverts commit 1c84236afb6e5c1285112fb1e71539f3ca89ab27. See the explanation in 564653f91d7031495a0b955c744a578352f34576. The lack of CAML_LD_LIBRARY_PATH causes regressions in dependent downstream packages that try to use dllzarith.so directly.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/ocaml-modules/zarith/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 9122a3509d96..d91f6e1c8a31 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, buildOcaml, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.8"; - url = https://github.com/ocaml/Zarith/archive/release-1.8.tar.gz; - sha256 = "1cn63c97aij19nrw5hc1zh1jpnbsdkzq99zyyk649c4s3xi3iqq7"; + version = "1.7"; + url = https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz; + sha256 = "0fmblap5nsbqq0dab63d6b7lsxpc3snkgz7jfldi2qa4s1kbnhfn"; } else { version = "1.3"; url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; @@ -16,20 +16,25 @@ let source = }; in -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-zarith-${version}"; +buildOcaml rec { + name = "zarith"; inherit (source) version; src = fetchurl { inherit (source) url sha256; }; + minimumSupportedOcamlVersion = "3.12.1"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; + # needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so + hasSharedObjects = true; + patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - createFindlibDestdir = true; + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; |