git.iko.soy/typeable/nixpkgs
on master help sign in
awesome: fixup lua paths, don't add random utilities to PATH

Lua path changes needed to fix build, removing PATH clutter while visiting this code since doesn't belong.

commit17d3eb2c9af719eac3668e7b88d65eca93750b41 authorWill Dietz <w@wdtz.org> dateMon 28 Jan 2019, 21:05 (8 years ago) parentcdb9adb
1 file changed+4−4
pkgs/applications/window-managers/awesome/default.nix+4−4
pkgs/applications/window-managers/awesome/default.nix+4−4
@@ -1,7 +1,6 @@
11{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
22, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
3−, xcb-util-cursor, makeWrapper, pango, gobject-introspection, unclutter
4−, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
3+, xcb-util-cursor, makeWrapper, pango, gobject-introspection
54, which, dbus, nettools, git, asciidoc, doxygen
65, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
76, libxkbcommon, xcbutilxrm, hicolor-icon-theme
@@ -45,7 +44,7 @@ with luaPackages; stdenv.mkDerivation rec {
4544
4645 GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
4746 LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
48− LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
47+ LUA_PATH = "?.lua;${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
4948
5049 postInstall = ''
5150 wrapProgram $out/bin/awesome \
@@ -53,7 +52,8 @@ with luaPackages; stdenv.mkDerivation rec {
5352 --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
5453 --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
5554 --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
56− --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
55+ --prefix LUA_PATH ';' "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \
56+ --prefix LUA_CPATH ';' "${lgi}/lib/lua/${lua.luaversion}/?.so"
5757
5858 wrapProgram $out/bin/awesome-client \
5959 --prefix PATH : "${which}/bin"