ocamlPackages.cstruct: 2.3.2 -> 3.0.2

This commit is contained in:
Vincent Laporte
2017-11-27 20:49:18 +00:00
parent e7f4979270
commit bfc0959511
10 changed files with 115 additions and 45 deletions
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg
, cpuid, ocb-stubblr
, cstruct, zarith, ppx_sexp_conv, sexplib
, lwt ? null
, cstruct-lwt ? null
}:
with stdenv.lib;
let withLwt = lwt != null; in
let withLwt = cstruct-lwt != null; in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-nocrypto-${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild topkg opam cpuid ocb-stubblr
ppx_sexp_conv ];
propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;
propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt cstruct-lwt;
buildPhase = ''
LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \