diff options
| author | Alexey Shmalko <rasen.dubi@gmail.com> | 2016-09-20 11:05:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 11:05:42 +0300 |
| commit | 631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5 (patch) | |
| tree | f9f971fa5e08171845f50e99e4518d821efd1518 /nixos/modules | |
| parent | a20a20f1363246000307e6dfeaf16d49daa4e06a (diff) | |
| parent | 0a42f98eac520b3e72b4493bf4199c875f92acce (diff) | |
| download | nixlib-631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5.tar nixlib-631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5.tar.gz nixlib-631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5.tar.bz2 nixlib-631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5.tar.lz nixlib-631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5.tar.xz nixlib-631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5.tar.zst nixlib-631c54c7a60bfd6dd7d8401953dcd3adfa90b1d5.zip | |
Merge pull request #18693 from Mic92/awesome
awesome: fix LUA_PATH for luaModules
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/window-managers/awesome.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 455b3568499f..eb97449c6bd9 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -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 ]; }; - } |