public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ocamlPackages.zarith: 1.7 -> 1.8"

Browse Source 
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.
This commit is contained in:
Austin Seipp 2019-04-23 09:21:44 -05:00
parent d6db31a720
commit 44da3f6522
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/ocaml-modules/zarith/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl { stdenv, buildOcaml, fetchurl
, ocaml, findlib, pkgconfig, perl , ocaml, findlib, pkgconfig, perl
, gmp , gmp
}: }:
@ -6,9 +6,9 @@
let source = let source =
if stdenv.lib.versionAtLeast ocaml.version "4.02" if stdenv.lib.versionAtLeast ocaml.version "4.02"
then { then {
version = "1.8"; version = "1.7";
url = https://github.com/ocaml/Zarith/archive/release-1.8.tar.gz; url = https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz;
sha256 = "1cn63c97aij19nrw5hc1zh1jpnbsdkzq99zyyk649c4s3xi3iqq7"; sha256 = "0fmblap5nsbqq0dab63d6b7lsxpc3snkgz7jfldi2qa4s1kbnhfn";
} else { } else {
version = "1.3"; version = "1.3";
url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
@ -16,20 +16,25 @@ let source =
}; };
in in
stdenv.mkDerivation rec { buildOcaml rec {
name = "ocaml${ocaml.version}-zarith-${version}"; name = "zarith";
inherit (source) version; inherit (source) version;
src = fetchurl { inherit (source) url sha256; }; src = fetchurl { inherit (source) url sha256; };
minimumSupportedOcamlVersion = "3.12.1";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml findlib perl ]; buildInputs = [ ocaml findlib perl ];
propagatedBuildInputs = [ gmp ]; propagatedBuildInputs = [ gmp ];
# needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so
hasSharedObjects = true;
patchPhase = "patchShebangs ./z_pp.pl"; patchPhase = "patchShebangs ./z_pp.pl";
configurePhase = '' configurePhase = ''
./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ./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; { meta = with stdenv.lib; {
description = "Fast, arbitrary precision OCaml integers"; description = "Fast, arbitrary precision OCaml integers";