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

Merge pull request #60094 from thoughtpolice/nixpkgs/zarith-fixes

Browse Source 
ocamlPackages: fix regression in zarith-dependent libraries
This commit is contained in:
Vincent Laporte 2019-04-25 08:56:55 +02:00 committed by GitHub
commit ed1b59a98e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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
}: }:
@ -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";