public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60329 from stefano-m/awesome-fix-60232

Browse Source 
awesome: refactor LUA_PATH env var and don't expose it at runtime
This commit is contained in:
Will Dietz 2019-04-27 19:37:09 -05:00 committed by GitHub
commit 5f7f4e39d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/window-managers/awesome/default.nix
View File

@ -42,17 +42,17 @@ with luaPackages; stdenv.mkDerivation rec {
cmakeFlags = "-DOVERRIDE_VERSION=${version}"; cmakeFlags = "-DOVERRIDE_VERSION=${version}";
GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; 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_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 = '' postInstall = ''
wrapProgram $out/bin/awesome \ wrapProgram $out/bin/awesome \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --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"
wrapProgram $out/bin/awesome-client \ wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin" --prefix PATH : "${which}/bin"