diff options
author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-09-17 13:01:44 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@higgsboson.tk> | 2016-09-18 19:18:03 +0200 |
commit | 0a42f98eac520b3e72b4493bf4199c875f92acce (patch) | |
tree | ddcbc13965bc09ce561d65d8831aca1ebed46b75 | |
parent | b32252ddfa530ff67e297ff6ba9e5cb0f91a767a (diff) | |
download | nixpkgs-0a42f98eac520b3e72b4493bf4199c875f92acce.tar nixpkgs-0a42f98eac520b3e72b4493bf4199c875f92acce.tar.gz nixpkgs-0a42f98eac520b3e72b4493bf4199c875f92acce.tar.bz2 nixpkgs-0a42f98eac520b3e72b4493bf4199c875f92acce.tar.lz nixpkgs-0a42f98eac520b3e72b4493bf4199c875f92acce.tar.xz nixpkgs-0a42f98eac520b3e72b4493bf4199c875f92acce.tar.zst nixpkgs-0a42f98eac520b3e72b4493bf4199c875f92acce.zip |
awesome: fix LUA_PATH for luaModules
lua modules can be also within share/ within a package. Previously only lib/ was included
-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 455b3568499..eb97449c6bd 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 ]; }; - } |