summary refs log tree commit diff
path: root/pkgs/applications/science/machine-learning
diff options
context:
space:
mode:
authorSergey Mironov <grrwlf@gmail.com>2016-03-16 23:52:09 +0300
committerSergey Mironov <grrwlf@gmail.com>2016-03-16 23:53:46 +0300
commit1b0513941425af8967e637032bd88dc933892e0a (patch)
tree6930330b86072d77a2482199276fc18b969ac590 /pkgs/applications/science/machine-learning
parentf499f61c85245d28adcd6393b3b2e2a5e891fffc (diff)
downloadnixpkgs-1b0513941425af8967e637032bd88dc933892e0a.tar
nixpkgs-1b0513941425af8967e637032bd88dc933892e0a.tar.gz
nixpkgs-1b0513941425af8967e637032bd88dc933892e0a.tar.bz2
nixpkgs-1b0513941425af8967e637032bd88dc933892e0a.tar.lz
nixpkgs-1b0513941425af8967e637032bd88dc933892e0a.tar.xz
nixpkgs-1b0513941425af8967e637032bd88dc933892e0a.tar.zst
nixpkgs-1b0513941425af8967e637032bd88dc933892e0a.zip
torch: Read LUA_PATH and LUA_CPATH set by users
Diffstat (limited to 'pkgs/applications/science/machine-learning')
-rw-r--r--pkgs/applications/science/machine-learning/torch/torch-distro.nix6
1 files changed, 4 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 cbbaf0383c7..2204af0597e 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -117,8 +117,10 @@ let
             wrapProgram $p \
               --set LD_LIBRARY_PATH "${lib.makeSearchPath "lib" runtimeDeps_}" \
               --set PATH "${lib.makeSearchPath "bin" runtimeDeps_}" \
-              --set LUA_PATH "'$LUA_PATH;$out/share/lua/${luajit.luaversion}/?.lua;$out/share/lua/${luajit.luaversion}/?/init.lua'" \
-              --set LUA_CPATH "'$LUA_CPATH;$out/lib/lua/${luajit.luaversion}/?.so;$out/lib/lua/${luajit.luaversion}/?/init.so'"
+              --suffix LUA_PATH ';' "\"$LUA_PATH\"" \
+              --suffix LUA_PATH ';' "\"$out/share/lua/${luajit.luaversion}/?.lua;$out/share/lua/${luajit.luaversion}/?/init.lua\"" \
+              --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \
+              --suffix LUA_CPATH ';' "\"$out/lib/lua/${luajit.luaversion}/?.so;$out/lib/lua/${luajit.luaversion}/?/init.so\""
           done
 
           eval "$postInstall"