@@ -1,21 +1,21 @@
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
7+, asciidoctor
88}:
99
1010with luaPackages; stdenv.mkDerivation rec {
1111 name = "awesome-${version}";
12− version = "4.2";
12+ version = "4.3";
1313
1414 src = fetchFromGitHub {
1515 owner = "awesomewm";
1616 repo = "awesome";
1717 rev = "v${version}";
18− sha256 = "1pcgagcvm6rdky8p8dd810j3ywaz0ncyk5xgaykslaixzrq60kff";
18+ sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf";
1919 };
2020
2121 nativeBuildInputs = [
@@ -27,6 +27,7 @@ with luaPackages; stdenv.mkDerivation rec {
2727 pkgconfig
2828 xmlto docbook_xml_dtd_45
2929 docbook_xsl findXMLCatalogs
30+ asciidoctor
3031 ];
3132
3233 propagatedUserEnvPkgs = [ hicolor-icon-theme ];
@@ -43,7 +44,7 @@ with luaPackages; stdenv.mkDerivation rec {
4344
4445 GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
4546 LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
46− 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";
4748
4849 postInstall = ''
4950 wrapProgram $out/bin/awesome \
@@ -51,7 +52,8 @@ with luaPackages; stdenv.mkDerivation rec {
5152 --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
5253 --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
5354 --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
54− --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"
5557
5658 wrapProgram $out/bin/awesome-client \
5759 --prefix PATH : "${which}/bin"