From 0f51d1fa59c7844990765f6ce36ac7f3df5163a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 05:14:44 +0000 Subject: [PATCH 1/2] ocamlPackages.gapi-ocaml: clean installPhase --- pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index a7c32a069fc..9c7be26503f 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"; From b0102f550153a98bd44e6efea1bdb030c1cf6507 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 05:25:14 +0000 Subject: [PATCH 2/2] ocamlPackages_4_02.async_ssl: remove redundancy --- pkgs/development/ocaml-modules/janestreet/async_ssl.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index fdfd0338bb2..bc1977ce2d6 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; {