diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index d706bae0ae6..831743a0522 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt}: +, docbook_xml_dtd_45, libxslt, coreutils}: stdenv.mkDerivation rec { name = "awesome-3.4.4"; @@ -15,6 +15,16 @@ stdenv.mkDerivation rec { imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; + # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in + # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as + # dependencies. + patchPhase = '' + # Fix the tab completion (supporting bash or zsh) + sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in + # Remove the 'root' PATH override (I don't know why they have that) + sed /WHOAMI/d -i utils/awsetbg + ''; + # Somehow libev does not get into the rpath, although it should. # Something may be wrong in the gcc wrapper. preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a6ed81d9f..e3c60550705 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7075,7 +7075,7 @@ let awesome = import ../applications/window-managers/awesome { inherit fetchurl stdenv xz cmake gperf imagemagick pkgconfig imlib2 libxdg_basedir libstartup_notification libev asciidoc libxslt xmlto dbus docbook_xsl - docbook_xml_dtd_45; + docbook_xml_dtd_45 coreutils; inherit (gtkLibs) glib pango; inherit (xorg) libxcb xcbutil; lua = lua5;