Merge branch 'master' into staging

2 files changed, 19 insertions, 23 deletions

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index ada6e8e742e..b6de07bff8a 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,25 +1,31 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
-, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl
-, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
+, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
+, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
 , xorgserver, xvfb_run, dmenu, i3status }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.12";
+  version = "4.13";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1";
+    sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl";
   };
 
+  nativeBuildInputs = [ which pkgconfig makeWrapper ];
+
   buildInputs = [
-    which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon
+    libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
     libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
     perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
     perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
     xorgserver xvfb_run
   ];
 
+  configureFlags = [ "--disable-builddir" ];
+
+  enableParallelBuilding = true;
+
   postPatch = ''
     patchShebangs .
   '';
@@ -45,12 +51,8 @@ stdenv.mkDerivation rec {
     ! grep -q '^not ok' testcases/latest/complete-run.log
   '';
 
-  configurePhase = "makeFlags=PREFIX=$out";
-
   postInstall = ''
     wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
-    mkdir -p $out/man/man1
-    cp man/*.1 $out/man/man1
     for program in $out/bin/i3-sensible-*; do
       sed -i 's/which/command -v/' $program
     done
@@ -59,7 +61,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A tiling window manager";
     homepage    = "http://i3wm.org";
-    maintainers = with maintainers; [ garbas modulistic ];
+    maintainers = with maintainers; [ garbas modulistic fpletz ];
     license     = licenses.bsd3;
     platforms   = platforms.all;
 
diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index fa03bc47d9e..3d8067f1882 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -1,26 +1,20 @@
-{ fetchurl, stdenv, i3 }:
+{ fetchurl, stdenv, i3, autoreconfHook }:
 
 i3.overrideDerivation (super : rec {
 
   name = "i3-gaps-${version}";
-  version = "4.12";
-  releaseDate = "2016-03-06";
+  version = "4.13";
+  releaseDate = "2016-11-08";
 
   src = fetchurl {
     url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
-    sha256 = "1i9l993cak85fcw12zgrb5cpspmjixr3yf8naa4zb8589mg4rb8s";
+    sha256 = "0w959nx2crn00fckqwb5y78vcr1j9mvq5lh25wyjszx04pjhf378";
   };
 
-  postUnpack = ''
-      echo -n "${version} (${releaseDate}, branch \\\"gaps-next\\\")" > ./i3-${version}/I3_VERSION
-      echo -n "${version}" > ./i3-${version}/VERSION
-  '';
+  nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
 
-  postInstall = ''
-    wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
-    for program in $out/bin/i3-sensible-*; do
-      sed -i 's/which/command -v/' $program
-    done
+  postUnpack = ''
+      echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
   '';
 
 }) // {