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.
This commit is contained in:
parent
26fac59c32
commit
a140fe83f5
|
@ -1,24 +1,23 @@
|
||||||
{ stdenv, fetchFromGitHub, zlib
|
{ 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 {
|
stdenv.mkDerivation rec {
|
||||||
name = "google-drive-ocamlfuse-${version}";
|
name = "google-drive-ocamlfuse-${version}";
|
||||||
version = "0.6.21";
|
version = "0.6.25";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "astrada";
|
owner = "astrada";
|
||||||
repo = "google-drive-ocamlfuse";
|
repo = "google-drive-ocamlfuse";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "14qvhz18pzxdgxk5vcs024ajbkxccfwc9p3z5r6vfkc9mm851v59";
|
sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ ocamlbuild ];
|
nativeBuildInputs = [ jbuilder opam ];
|
||||||
|
|
||||||
buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
|
buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
|
||||||
|
|
||||||
configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
|
buildPhase = "jbuilder build @install";
|
||||||
buildPhase = "ocaml setup.ml -build";
|
installPhase = "mkdir $out && jbuilder install --prefix $out";
|
||||||
installPhase = "ocaml setup.ml -install";
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://gdfuse.forge.ocamlcore.org/;
|
homepage = http://gdfuse.forge.ocamlcore.org/;
|
||||||
|
|
Loading…
Reference in a new issue