diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-31 21:20:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-31 21:20:58 +0200 |
| commit | 41649f5fceada5b7477dea199dac3fec2b0b0e91 (patch) | |
| tree | cb75c9452946984e121067c59f11108ebd31d818 | |
| parent | 8ad1476755ad5686bc68e060d41f8d1ce308e981 (diff) | |
| parent | b0102f550153a98bd44e6efea1bdb030c1cf6507 (diff) | |
| download | nixlib-41649f5fceada5b7477dea199dac3fec2b0b0e91.tar nixlib-41649f5fceada5b7477dea199dac3fec2b0b0e91.tar.gz nixlib-41649f5fceada5b7477dea199dac3fec2b0b0e91.tar.bz2 nixlib-41649f5fceada5b7477dea199dac3fec2b0b0e91.tar.lz nixlib-41649f5fceada5b7477dea199dac3fec2b0b0e91.tar.xz nixlib-41649f5fceada5b7477dea199dac3fec2b0b0e91.tar.zst nixlib-41649f5fceada5b7477dea199dac3fec2b0b0e91.zip | |
Merge pull request #41197 from vbgl/ocaml-clean-201805
ocamlPackages.gapi_ocaml: minor cleaning
| -rw-r--r-- | pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/async_ssl.nix | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index a7c32a069fc8..9c7be26503f5 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "gapi-ocaml is not available for OCaml ${ocaml.version}" @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml jbuilder findlib ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; - installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; - - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { description = "OCaml client for google services"; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index fdfd0338bb23..bc1977ce2d69 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -6,7 +6,6 @@ buildOcamlJane rec { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; - postPatch = "export CAML_LD_LIBRARY_PATH=${integers}/lib/ocaml/${ocaml.version}/site-lib/stubslibs:$CAML_LD_LIBRARY_PATH"; propagatedBuildInputs = [ ctypes async comparelib core fieldslib herelib pipebang sexplib openssl ocaml_oasis ]; meta = with stdenv.lib; { |