summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2012-10-01 21:16:02 +0200
committeraszlig <aszlig@redmoonstudios.org>2012-10-02 03:46:41 +0200
commit7e439ea13c91b9a5b156215f1bcce9c6798c8054 (patch)
treea99367ba2480911a3bf2321358714aca7e3ae889 /pkgs/applications/window-managers
parentcbaf071944c60135c883838b3657b3f597d7e6b5 (diff)
downloadnixlib-7e439ea13c91b9a5b156215f1bcce9c6798c8054.tar
nixlib-7e439ea13c91b9a5b156215f1bcce9c6798c8054.tar.gz
nixlib-7e439ea13c91b9a5b156215f1bcce9c6798c8054.tar.bz2
nixlib-7e439ea13c91b9a5b156215f1bcce9c6798c8054.tar.lz
nixlib-7e439ea13c91b9a5b156215f1bcce9c6798c8054.tar.xz
nixlib-7e439ea13c91b9a5b156215f1bcce9c6798c8054.tar.zst
nixlib-7e439ea13c91b9a5b156215f1bcce9c6798c8054.zip
i3: Update to version 4.3.
Though upstream clearly recommends to not deactivate Pango, we currently can't
use Pango right now, as we are stuck at cairo-1.10.2. This version only has
experimental support for XCB which became stable in 1.12.x.

So we need to wait for 21bf5ef509dcadebab10de0ba142d55776a961f1 to be merged
into master before we can enable Pango.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/i3/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 14fd6ce41931..042e1a323a6d 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -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";