public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2019-09-18 21:15:35 +02:00
parent fa4a3af5a7 6b3832a519
commit 62791c3743
167 changed files with 11105 additions and 6483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/cryptokit/default.nix
View File

@@ -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;

2
pkgs/development/ocaml-modules/ocsigen-server/default.nix
View File

@@ -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;