From 61c9725ff4ec873ae1c51864a57c8569debfcc86 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Sep 2019 16:06:28 +0000 Subject: [PATCH 1/2] ocamlPackages.cryptokit: fix installation of shared libraries Fixes #68874 --- pkgs/development/ocaml-modules/cryptokit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 8180373a3dd..8181433e1ee 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildFlags = "setup.data build"; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit"; + preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = { homepage = http://pauillac.inria.fr/~xleroy/software.html; From 2173d4756006494ab5f276bea99af9f2f4678d50 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Sep 2019 16:06:35 +0000 Subject: [PATCH 2/2] ocamlPackages.ocsigen_server: fix loading of shared libraries --- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 9499bff84a1..df484b230c2 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH:${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true;