ocamlPackages.nocrypto: 0.5.3 -> 0.5.4

NixOS · Mar 23, 2017 · 55ac21e · 55ac21e
1 parent 5e0d0f4
commit 55ac21e
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,32 +1,33 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib
-, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib
-, lwt ? null}:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg
+, cpuid, ocb-stubblr
+, cstruct, zarith, ocaml_oasis, ppx_sexp_conv, sexplib
+, lwt ? null
+}:
 
 with stdenv.lib;
 let withLwt = lwt != null; in
 
-buildOcaml rec {
-  name = "nocrypto";
-  version = "0.5.3";
-
-  minimumSupportedOcamlVersion = "4.02";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-nocrypto-${version}";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner  = "mirleft";
     repo   = "ocaml-nocrypto";
     rev    = "v${version}";
-    sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl";
+    sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p";
   };
 
-  buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ];
+  buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild topkg opam cpuid ocb-stubblr
+    ppx_sexp_conv ];
   propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;
 
-  configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"];
-
-  configurePhase = "./configure --prefix $out $configureFlags";
+  buildPhase = ''
+    LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \
+    ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"}
+  '';
+  inherit (topkg) installPhase;
 
-  doCheck = true;
-  checkTarget = "test";
   createFindlibDestdir = true;
 
   meta = {