From fb13625a44099fe03b6e6d671b9bbb06ab69ae7f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Apr 2016 16:55:20 +0100 Subject: [PATCH] rofi: 0.15.12 -> 1.0.0 (#14950) --- pkgs/applications/misc/rofi/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 9f11a141ff4..e1ee9b2d145 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,21 +1,31 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig -, libX11, libXinerama, pango, cairo +, libX11, libxkbcommon, pango, cairo, glib +, libxcb, xcbutil, xcbutilwm, which, git , libstartup_notification, i3Support ? false, i3 }: stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "0.15.12"; + version = "1.0.0"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; - sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5"; + url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; + sha256 = "0ard95pjgykafm5ga8lfy7x206f07lrc6kara5s9irlhdgblq2m5"; }; - buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango - cairo libstartup_notification + preConfigure = '' + patchShebangs "script" + # root not present in build /etc/passwd + sed -i 's/~root/~nobody/g' test/helper-expand.c + ''; + + buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango + cairo libstartup_notification libxcb xcbutil xcbutilwm + which git ] ++ stdenv.lib.optional i3Support i3; + doCheck = true; + meta = { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi;