gapi-ocaml: 0.3.4 -> 0.3.6. Also change to use opam/jbuilder for build.

This commit is contained in:
Corey O'Connor 2018-03-19 11:43:28 -07:00
parent e340a984e4
commit 26fac59c32
1 changed files with 6 additions and 7 deletions

View File

@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gapi-ocaml-${version}"; name = "gapi-ocaml-${version}";
version = "0.3.4"; version = "0.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astrada"; owner = "astrada";
repo = "gapi-ocaml"; repo = "gapi-ocaml";
rev = "v${version}"; rev = "v${version}";
sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv"; sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
}; };
buildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml jbuilder findlib ];
propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
configurePhase = "ocaml setup.ml -configure --prefix $out"; installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {