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.

+6 -7
+6 -7
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
··· 1 1 { stdenv, fetchFromGitHub, zlib 2 - , ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: 2 + , ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "google-drive-ocamlfuse-${version}"; 6 - version = "0.6.21"; 6 + version = "0.6.25"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "astrada"; 10 10 repo = "google-drive-ocamlfuse"; 11 11 rev = "v${version}"; 12 - sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59"; 12 + sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp"; 13 13 }; 14 14 15 - nativeBuildInputs = [ ocamlbuild ]; 15 + nativeBuildInputs = [ jbuilder opam ]; 16 16 17 17 buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; 18 18 19 - configurePhase = "ocaml setup.ml -configure --prefix \"$out\""; 20 - buildPhase = "ocaml setup.ml -build"; 21 - installPhase = "ocaml setup.ml -install"; 19 + buildPhase = "jbuilder build @install"; 20 + installPhase = "mkdir $out && jbuilder install --prefix $out"; 22 21 23 22 meta = { 24 23 homepage = http://gdfuse.forge.ocamlcore.org/;