summary refs log tree commit diff
path: root/pkgs/applications/science/machine-learning/torch
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-13 15:53:51 +0300
committerNikolay Amiantov <ab@fmap.me>2016-04-13 22:09:41 +0300
commit8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e (patch)
tree8bab721107fae818dad896a0876d50d3d0a0d981 /pkgs/applications/science/machine-learning/torch
parente26119619f7ce64b065e692ba0cd31f53b9ef637 (diff)
downloadnixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar
nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.gz
nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.bz2
nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.lz
nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.xz
nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.zst
nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.zip
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'pkgs/applications/science/machine-learning/torch')
-rw-r--r--pkgs/applications/science/machine-learning/torch/torch-distro.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index 067cb1341140..5ff510a52ce8 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -73,8 +73,8 @@ let
 
           for p in $out/bin/*; do
             wrapProgram $p \
-              --suffix LD_LIBRARY_PATH ';' "${lib.makeSearchPath "lib" runtimeDeps_}" \
-              --suffix PATH ';' "${lib.makeSearchPath "bin" runtimeDeps_}" \
+              --suffix LD_LIBRARY_PATH ';' "${lib.makeLibraryPath runtimeDeps_}" \
+              --suffix PATH ';' "${lib.makeBinPath runtimeDeps_}" \
               --suffix LUA_PATH ';' "\"$LUA_PATH\"" \
               --suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \
               --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \