diff options
| author | Corey O'Connor <coreyoconnor@gmail.com> | 2018-03-19 11:43:28 -0700 |
|---|---|---|
| committer | Corey O'Connor <coreyoconnor@gmail.com> | 2018-03-19 11:47:12 -0700 |
| commit | 26fac59c328663529d44924d7569e4457d1ba3ed (patch) | |
| tree | 60f25d312d762bb5766807fb4c3f0e2c6700c5a4 /pkgs/development/ocaml-modules/gapi-ocaml | |
| parent | e340a984e40cd6aeb423a0239aac545da1c3aa43 (diff) | |
| download | nixpkgs-26fac59c328663529d44924d7569e4457d1ba3ed.tar nixpkgs-26fac59c328663529d44924d7569e4457d1ba3ed.tar.gz nixpkgs-26fac59c328663529d44924d7569e4457d1ba3ed.tar.bz2 nixpkgs-26fac59c328663529d44924d7569e4457d1ba3ed.tar.lz nixpkgs-26fac59c328663529d44924d7569e4457d1ba3ed.tar.xz nixpkgs-26fac59c328663529d44924d7569e4457d1ba3ed.tar.zst nixpkgs-26fac59c328663529d44924d7569e4457d1ba3ed.zip | |
gapi-ocaml: 0.3.4 -> 0.3.6. Also change to use opam/jbuilder for build.
Diffstat (limited to 'pkgs/development/ocaml-modules/gapi-ocaml')
| -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 a993a64a49a..b4e06d3c999 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 = { |