diff options
| author | Marius Bakke <m.bakke@warwick.ac.uk> | 2015-02-27 15:34:11 +0000 |
|---|---|---|
| committer | Marius Bakke <m.bakke@warwick.ac.uk> | 2015-02-27 16:06:35 +0000 |
| commit | fe1243cc8ee3c8e9f5a3451b159138744525b572 (patch) | |
| tree | acdc16c7d5c0a4647fa115c37add7e712ed3d5de | |
| parent | dd29e43add3e4898460291c250eb48d5429d4779 (diff) | |
| download | nixpkgs-fe1243cc8ee3c8e9f5a3451b159138744525b572.tar nixpkgs-fe1243cc8ee3c8e9f5a3451b159138744525b572.tar.gz nixpkgs-fe1243cc8ee3c8e9f5a3451b159138744525b572.tar.bz2 nixpkgs-fe1243cc8ee3c8e9f5a3451b159138744525b572.tar.lz nixpkgs-fe1243cc8ee3c8e9f5a3451b159138744525b572.tar.xz nixpkgs-fe1243cc8ee3c8e9f5a3451b159138744525b572.tar.zst nixpkgs-fe1243cc8ee3c8e9f5a3451b159138744525b572.zip | |
Rofi: update to 0.15.2
requires >=automake-1.14
| -rw-r--r-- | pkgs/applications/misc/rofi/default.nix | 12 | ||||
| -rw-r--r-- | 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); |