swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

awesome: fix LUA_PATH for luaModules

Browse source 
lua modules can be also within share/ within a package.
Previously only lib/ was included
This commit is contained in:
Jörg Thalheim 2016-09-17 13:01:44 +02:00
parent b32252ddfa
commit 0a42f98eac
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
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;
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 ];
};
}