From dd29e43add3e4898460291c250eb48d5429d4779 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 5 Feb 2015 00:03:09 +0000
Subject: [PATCH 1/2] new package: rofi

---
 pkgs/applications/misc/rofi/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/misc/rofi/default.nix

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
new file mode 100644
index 00000000000..74a2b8a896c
--- /dev/null
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, libX11, libXinerama, libXft, pango
+, i3Support ? false, i3
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.15.1";
+  name = "rofi-${version}";
+
+  src = fetchFromGitHub {
+    repo = "rofi";
+    owner = "DaveDavenport";
+    rev = "${version}";
+    sha256 = "11fg85xg7mpw9vldmp163c9y398nvbilwqsl06ms0xbbmpyc2hgz";
+  };
+
+  buildInputs = [ libX11 libXinerama libXft pango autoreconfHook pkgconfig
+                ] ++ stdenv.lib.optional i3Support i3;
+
+  meta = {
+      description = "Window switcher, run dialog and dmenu replacement";
+      homepage = https://davedavenport.github.io/rofi;
+      license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b029cfdc4c..04263eabfdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11298,6 +11298,8 @@ let
     qt = qt4;
   });
 
+  rofi = callPackage ../applications/misc/rofi { };
+
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
     enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);

From fe1243cc8ee3c8e9f5a3451b159138744525b572 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Fri, 27 Feb 2015 15:34:11 +0000
Subject: [PATCH 2/2] Rofi: update to 0.15.2

requires >=automake-1.14
---
 pkgs/applications/misc/rofi/default.nix | 12 ++++++++----
 pkgs/top-level/all-packages.nix         |  4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 74a2b8a896c..1bbe026cfeb 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig
 , libX11, libXinerama, libXft, pango
 , i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.15.1";
   name = "rofi-${version}";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     repo = "rofi";
     owner = "DaveDavenport";
     rev = "${version}";
-    sha256 = "11fg85xg7mpw9vldmp163c9y398nvbilwqsl06ms0xbbmpyc2hgz";
+    sha256 = "0b8k5g2fpqrz1yac09kmfk4caxcc107qq4yhncnl159xdxw66vz8";
   };
 
-  buildInputs = [ libX11 libXinerama libXft pango autoreconfHook pkgconfig
+  buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
                 ] ++ stdenv.lib.optional i3Support i3;
 
+  preConfigure = ''
+    autoreconf -vif
+  '';
+
   meta = {
       description = "Window switcher, run dialog and dmenu replacement";
       homepage = https://davedavenport.github.io/rofi;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04263eabfdb..9b2789932ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11298,7 +11298,9 @@ let
     qt = qt4;
   });
 
-  rofi = callPackage ../applications/misc/rofi { };
+  rofi = callPackage ../applications/misc/rofi {
+    automake = automake114x;
+  };
 
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);