diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-14 13:44:07 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-14 13:44:07 -0500 |
| commit | bca2e8255e4230398edd1f91ce45521d54d6122e (patch) | |
| tree | 1a4fad3a8ddac150af210751ae44eb0c304bc0ea /pkgs/development/tools/ocaml | |
| parent | a951f2a27f3f664eb1f33ee3bc2193c19383e59f (diff) | |
| download | nixlib-bca2e8255e4230398edd1f91ce45521d54d6122e.tar nixlib-bca2e8255e4230398edd1f91ce45521d54d6122e.tar.gz nixlib-bca2e8255e4230398edd1f91ce45521d54d6122e.tar.bz2 nixlib-bca2e8255e4230398edd1f91ce45521d54d6122e.tar.lz nixlib-bca2e8255e4230398edd1f91ce45521d54d6122e.tar.xz nixlib-bca2e8255e4230398edd1f91ce45521d54d6122e.tar.zst nixlib-bca2e8255e4230398edd1f91ce45521d54d6122e.zip | |
treewide: CAML_LD_LIBRARY_PATH may be undefined
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/camlidl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/utop/default.nix | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 09de5b02737b..309c44d6d463 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -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" ''; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 6bf34a6e9587..9db5ed10c842 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -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 diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 290ab9b571f4..f154b94ae336 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -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 ''; |