diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-20 00:17:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-20 00:17:43 +0000 |
commit | f71a636d3f52072bd2976dfc8bb4556214959af3 (patch) | |
tree | 65d70ba7232571174775fa0f7867efc97bc97b7f /pkgs/development | |
parent | 1f50e841971339b006d51539582f1e345ffc5c37 (diff) | |
parent | a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e (diff) | |
download | nixlib-f71a636d3f52072bd2976dfc8bb4556214959af3.tar nixlib-f71a636d3f52072bd2976dfc8bb4556214959af3.tar.gz nixlib-f71a636d3f52072bd2976dfc8bb4556214959af3.tar.bz2 nixlib-f71a636d3f52072bd2976dfc8bb4556214959af3.tar.lz nixlib-f71a636d3f52072bd2976dfc8bb4556214959af3.tar.xz nixlib-f71a636d3f52072bd2976dfc8bb4556214959af3.tar.zst nixlib-f71a636d3f52072bd2976dfc8bb4556214959af3.zip |
Merge pull request #37385 from coreyoconnor/google-drive-ocamlfuse-update
google-drive-ocamlfuse and gapi-ocaml update
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index a993a64a49ac..b4e06d3c999d 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -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 = { |