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

treewide: CAML_LD_LIBRARY_PATH may be undefined

Browse Source
This commit is contained in:
John Ericson
2019-11-14 13:44:07 -05:00
parent a951f2a27f
commit bca2e8255e
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/camlidl/default.nix
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
setupHook = writeText "setupHook.sh" ''
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
'';
pkgs/development/tools/ocaml/findlib/default.nix
+1 -1
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
fi
if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"
fi
export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
if test -n "''${createFindlibDestdir-}"; then
pkgs/development/tools/ocaml/utop/default.nix
+1
View File
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out"/${path}
for e in OCAMLPATH CAML_LD_LIBRARY_PATH; do
[[ -v "$e" ]] || continue
printf %s "''${!e}" > "$out"/${path}/$e
done
'';