summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2018-03-15 17:19:31 +0000
committerVincent Laporte <vbgl@users.noreply.github.com>2018-03-25 18:33:13 +0200
commit387d7916637ae4b0e71d54fbcbd58b6c416f3709 (patch)
treedc094ab2bac76834386e038c8daba6ba595af92a /pkgs/development/tools
parent2455478754f6757e0648e8c8a276da45b0b4fa1c (diff)
downloadnixlib-387d7916637ae4b0e71d54fbcbd58b6c416f3709.tar
nixlib-387d7916637ae4b0e71d54fbcbd58b6c416f3709.tar.gz
nixlib-387d7916637ae4b0e71d54fbcbd58b6c416f3709.tar.bz2
nixlib-387d7916637ae4b0e71d54fbcbd58b6c416f3709.tar.lz
nixlib-387d7916637ae4b0e71d54fbcbd58b6c416f3709.tar.xz
nixlib-387d7916637ae4b0e71d54fbcbd58b6c416f3709.tar.zst
nixlib-387d7916637ae4b0e71d54fbcbd58b6c416f3709.zip
ocamlPackages.findlib: automatically populate the CAML_LD_LIBRARY_PATH env. variable
With directories of the form:
  lib/ocaml/${ocaml.version}/site-lib/stubslibs
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/ocaml/findlib/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 997a81f889e3..6f136a7ef289 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
         if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then
             export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
         fi
+        if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then
+            export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"
+        fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
         if test -n "$createFindlibDestdir"; then
           mkdir -p $OCAMLFIND_DESTDIR