Merge pull request #37385 from coreyoconnor/google-drive-ocamlfuse-update

google-drive-ocamlfuse and gapi-ocaml update
This commit is contained in:
Jörg Thalheim
2018-03-20 00:17:43 +00:00
committed by GitHub
2 changed files with 12 additions and 14 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 {
name = "gapi-ocaml-${version}";
version = "0.3.4";
version = "0.3.6";
src = fetchFromGitHub {
owner = "astrada";
repo = "gapi-ocaml";
rev = "v${version}";
sha256 = "07p6p108fyf9xz54jbcld40k3r9zyybxmr5i3rrkhgwm8gb6sbhv";
sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
};
buildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ ocaml jbuilder findlib ];
propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
createFindlibDestdir = true;
meta = {