Merge pull request #18693 from Mic92/awesome
awesome: fix LUA_PATH for luaModules
This commit is contained in:
commit
631c54c7a6
1 changed files with 3 additions and 6 deletions
|
@ -6,7 +6,7 @@ let
|
|||
|
||||
cfg = config.services.xserver.windowManager.awesome;
|
||||
awesome = cfg.package;
|
||||
|
||||
inherit (pkgs.luaPackages) getLuaPath getLuaCPath;
|
||||
in
|
||||
|
||||
{
|
||||
|
@ -46,10 +46,8 @@ in
|
|||
{ name = "awesome";
|
||||
start =
|
||||
''
|
||||
${concatMapStrings (pkg: ''
|
||||
export LUA_CPATH=$LUA_CPATH''${LUA_CPATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.so
|
||||
export LUA_PATH=$LUA_PATH''${LUA_PATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.lua
|
||||
'') cfg.luaModules}
|
||||
export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}"
|
||||
export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}"
|
||||
|
||||
${awesome}/bin/awesome &
|
||||
waitPID=$!
|
||||
|
@ -59,5 +57,4 @@ in
|
|||
environment.systemPackages = [ awesome ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue