diff options
author | Will Dietz <w@wdtz.org> | 2019-04-27 19:37:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-27 19:37:09 -0500 |
commit | 5f7f4e39d10a381bee9167ef1eaafad11b9aaee9 (patch) | |
tree | 9316a244d944c448adc63d4ddfafc8f103ae0e69 /pkgs/applications | |
parent | 6eaf73868bb54fd6aa9b51989be26242fc2c2a08 (diff) | |
parent | c973e15fb6f54f5d1bc783dddfeddd59ba664226 (diff) |
Merge pull request #60329 from stefano-m/awesome-fix-60232
awesome: refactor LUA_PATH env var and don't expose it at runtime
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 364771de80fd6..fa86257a1a959 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -42,17 +42,17 @@ with luaPackages; stdenv.mkDerivation rec { cmakeFlags = "-DOVERRIDE_VERSION=${version}"; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; + # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags + # below for how awesome finds the libraries it needs at runtime. LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; - LUA_PATH = "?.lua;${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; + LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; postInstall = '' wrapProgram $out/bin/awesome \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LUA_PATH ';' "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \ - --prefix LUA_CPATH ';' "${lgi}/lib/lua/${lua.luaversion}/?.so" + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" |