public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the 'awesome' tab completion on Run command

Browse Source 
svn path=/nixpkgs/trunk/; revision=21677
This commit is contained in:
Lluís Batlle i Rossell 2010-05-09 11:01:29 +00:00
parent 6fe4db1c7d
commit 9012b226c7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/window-managers/awesome/default.nix
View File

@ -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 = ''

2
pkgs/top-level/all-packages.nix
View File

@ -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;