replace makeSearchPath tree-wise to take care of possible multiple outputs

2016-04-13 22:09:41 +03:00
parent e26119619f
commit 8b7ebaffeb
56 changed files with 71 additions and 72 deletions
@@ -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\"" \