diff options
author | Corey O'Connor <coreyoconnor@gmail.com> | 2018-03-19 11:45:06 -0700 |
---|---|---|
committer | Corey O'Connor <coreyoconnor@gmail.com> | 2018-03-19 11:47:18 -0700 |
commit | a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e (patch) | |
tree | d1c0105e700b7f0b95a8776d986a0f6920822e9a | |
parent | 26fac59c328663529d44924d7569e4457d1ba3ed (diff) | |
download | nixlib-a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e.tar nixlib-a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e.tar.gz nixlib-a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e.tar.bz2 nixlib-a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e.tar.lz nixlib-a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e.tar.xz nixlib-a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e.tar.zst nixlib-a140fe83f53bc7a593ce41f10fa4fc2d6cbdb59e.zip |
google-drive-ocamlfuse: 0.6.21 -> 0.6.25.
Also change to use jbuilder for build per upstream instructions. In this case, the build needs to be driven by jbuilder but opam still needs to be in PATH.
-rw-r--r-- | pkgs/applications/networking/google-drive-ocamlfuse/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index ddc9df759996..87ef5f2a41a2 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchFromGitHub, zlib -, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; - version = "0.6.21"; + version = "0.6.25"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59"; + sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp"; }; - nativeBuildInputs = [ ocamlbuild ]; + nativeBuildInputs = [ jbuilder opam ]; buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; - configurePhase = "ocaml setup.ml -configure --prefix \"$out\""; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + buildPhase = "jbuilder build @install"; + installPhase = "mkdir $out && jbuilder install --prefix $out"; meta = { homepage = http://gdfuse.forge.ocamlcore.org/; |