diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-09-18 05:09:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 05:09:57 +0000 |
| commit | e598c4001fda0088506cdc12bf8053705c46676d (patch) | |
| tree | db5dc3fc55f43c2415318d6c4569a5b6e1239697 /pkgs/development | |
| parent | 651cd75f6ce60c9a828c0827e838baee2629674d (diff) | |
| parent | 2173d4756006494ab5f276bea99af9f2f4678d50 (diff) | |
| download | nixpkgs-e598c4001fda0088506cdc12bf8053705c46676d.tar nixpkgs-e598c4001fda0088506cdc12bf8053705c46676d.tar.gz nixpkgs-e598c4001fda0088506cdc12bf8053705c46676d.tar.bz2 nixpkgs-e598c4001fda0088506cdc12bf8053705c46676d.tar.lz nixpkgs-e598c4001fda0088506cdc12bf8053705c46676d.tar.xz nixpkgs-e598c4001fda0088506cdc12bf8053705c46676d.tar.zst nixpkgs-e598c4001fda0088506cdc12bf8053705c46676d.zip | |
Merge pull request #68925 from vbgl/ocaml-cryptokit-fix-68874
ocamlPackages.cryptokit: fix #68874
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/cryptokit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
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; 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; |