diff options
| author | Uli Schlachter <psychon@users.noreply.github.com> | 2018-01-02 18:24:56 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-02 17:24:56 +0000 |
| commit | 5465d6f7ded73a815b4ed3953f6d00d0aa563ac3 (patch) | |
| tree | 07976f248ef7f15b5a08975fe26b5179b578f2a6 | |
| parent | c98eb9e9b982a33d00bb5ab7da8d646c63912e8e (diff) | |
| download | nixpkgs-5465d6f7ded73a815b4ed3953f6d00d0aa563ac3.tar nixpkgs-5465d6f7ded73a815b4ed3953f6d00d0aa563ac3.tar.gz nixpkgs-5465d6f7ded73a815b4ed3953f6d00d0aa563ac3.tar.bz2 nixpkgs-5465d6f7ded73a815b4ed3953f6d00d0aa563ac3.tar.lz nixpkgs-5465d6f7ded73a815b4ed3953f6d00d0aa563ac3.tar.xz nixpkgs-5465d6f7ded73a815b4ed3953f6d00d0aa563ac3.tar.zst nixpkgs-5465d6f7ded73a815b4ed3953f6d00d0aa563ac3.zip | |
awesome: Use --search instead of $LUA_PATH/$LUA_CPATH
Instead of polluting the environment with environment variables which are inherited by processes spawned from awesome, use the command line argument "--search" to add things to the search path. cc #33169
| -rw-r--r-- | nixos/modules/services/x11/window-managers/awesome.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index eb97449c6bd..71eb02ec595 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -6,7 +6,11 @@ let cfg = config.services.xserver.windowManager.awesome; awesome = cfg.package; - inherit (pkgs.luaPackages) getLuaPath getLuaCPath; + getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}"; + makeSearchPath = lib.concatMapStrings (path: + " --search " + (getLuaPath path "share") + + " --search " + (getLuaPath path "lib") + ); in { @@ -46,10 +50,7 @@ in { name = "awesome"; start = '' - export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}" - export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}" - - ${awesome}/bin/awesome & + ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} & waitPID=$! ''; }; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 4043c05e3d6..ca596cdfddc 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -49,8 +49,8 @@ with luaPackages; stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/awesome \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix LUA_CPATH ";" '${lgi}/lib/lua/${lua.luaversion}/?.so' \ - --prefix LUA_PATH ";" '${lgi}/share/lua/${lua.luaversion}/?.lua' \ + --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ + --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" |