Merge remote-tracking branch 'origin/master' into x-updates

2012-10-03 14:43:10 -04:00
parent b78256fbd7 f9714ace11
commit 31f89ba349
23 changed files with 291 additions and 62 deletions
@@ -3,17 +3,21 @@
  libXcursor, coreutils, perl }:

 stdenv.mkDerivation rec {
-  name = "i3-4.2";
+  name = "i3-${version}";
+  version = "4.3";

  src = fetchurl {
    url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
+    sha256 = "895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925";
  };

  buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
    libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];

-  patchPhase = "patchShebangs .";
+  patchPhase = ''
+    sed -i -e '/^# Pango/,/^$/d' common.mk
+    patchShebangs .
+  '';

  configurePhase = "makeFlags=PREFIX=$out";