awesome-3.4.11 - ru manpages disabled because of build failure

svn path=/nixpkgs/trunk/; revision=31173

1 files changed, 15 insertions, 5 deletions

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b94b350a8482..fbf3b087cc70 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,10 +1,12 @@
 {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
 , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil
+, xcbutilImage, xcbutilKeysyms, xcbutilWm, libpthreadstubs, libXau
+, libXdmcp, pixman, doxygen
 , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 let
-  version = "3.4.9";
+  version = "3.4.11";
 in
 
 stdenv.mkDerivation rec {
@@ -12,11 +14,12 @@ stdenv.mkDerivation rec {
  
   src = fetchurl {
     url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7";
+    sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
-    imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev
+    imlib2 libxcb libxdg_basedir xcbutil xcbutilImage xcbutilKeysyms xcbutilWm
+    libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen
     asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ];
 
   # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in
@@ -27,10 +30,17 @@ stdenv.mkDerivation rec {
     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
+    # Russian manpages fail to be generated:
+    #  [ 56%] Generating manpages/ru/man1/awesome.1.xml
+    #  asciidoc: ERROR: <stdin>: line 3: name section expected
+    #  asciidoc: FAILED: <stdin>: line 3: section title expected
+    #  make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
+    substituteInPlace CMakeLists.txt \
+      --replace "set(AWE_MAN_LANGS es fr de ru)" \
+                "set(AWE_MAN_LANGS es fr de)"
   '';
 
-  patches = [ ./cmake284.patch ];
-
+  # XXX: maybe not needed anymore
   # Somehow libev does not get into the rpath, although it should.
   # Something may be wrong in the gcc wrapper.
   preBuild = ''