mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
13 lines
680 B
Diff
13 lines
680 B
Diff
--- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200
|
|
+++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200
|
|
@@ -287,7 +287,8 @@
|
|
(List.fold_right (add_dir ~user:false) Config.plugin_dir []) ;
|
|
let pkgs = ref [] in
|
|
List.iter (scan_directory pkgs) !load_path ;
|
|
- let findlib_path = String.concat ":" !load_path in
|
|
+ let findlib_path = String.concat ":" (!load_path @
|
|
+ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
|
|
Klog.debug ~dkey "setting findlib path to %s" findlib_path;
|
|
Findlib.init ~env_ocamlpath:findlib_path ();
|
|
load_packages (List.rev !pkgs) ;
|