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

Merge pull request #18693 from Mic92/awesome

Browse Source 
awesome: fix LUA_PATH for luaModules
This commit is contained in:
Alexey Shmalko 2016-09-20 11:05:42 +03:00 committed by GitHub
commit 631c54c7a6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/x11/window-managers/awesome.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.xserver.windowManager.awesome; cfg = config.services.xserver.windowManager.awesome;
awesome = cfg.package; awesome = cfg.package;
inherit (pkgs.luaPackages) getLuaPath getLuaCPath;
in in
{ {
@ -46,10 +46,8 @@ in
{ name = "awesome"; { name = "awesome";
start = start =
'' ''
${concatMapStrings (pkg: '' export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}"
export LUA_CPATH=$LUA_CPATH''${LUA_CPATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.so export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}"
export LUA_PATH=$LUA_PATH''${LUA_PATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.lua
'') cfg.luaModules}
${awesome}/bin/awesome & ${awesome}/bin/awesome &
waitPID=$! waitPID=$!
@ -59,5 +57,4 @@ in
environment.systemPackages = [ awesome ]; environment.systemPackages = [ awesome ];
}; };
} }