public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17719 from mbakke/rofi-1.2.0 

rofi: 1.1.0 -> 1.2.0
This commit is contained in:
Rok Garbas 2016-08-15 00:58:02 +02:00 committed by GitHub
parent 45d183614d b5bd862f24
commit 6f074bad5b
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/maintainers.nix
View File

@ -240,7 +240,7 @@
mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>"; mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>"; matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>"; maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
mbakke = "Marius Bakke <ymse@tuta.io>"; mbakke = "Marius Bakke <mbakke@fastmail.com>";
matthewbauer = "Matthew Bauer <mjbauer95@gmail.com>"; matthewbauer = "Matthew Bauer <mjbauer95@gmail.com>";
mbe = "Brandon Edens <brandonedens@gmail.com>"; mbe = "Brandon Edens <brandonedens@gmail.com>";
mboes = "Mathieu Boespflug <mboes@tweag.net>"; mboes = "Mathieu Boespflug <mboes@tweag.net>";

16
pkgs/applications/misc/rofi/default.nix
View File

@ -1,15 +1,14 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libX11, libxkbcommon, pango { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango
, cairo, glib, libxcb, xcbutil, xcbutilwm, libstartup_notification , cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, i3Support ? false, i3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.0"; version = "1.2.0";
name = "rofi-${version}"; name = "rofi-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz";
sha256 = "1l8vl0mh7i0b1ycifqpg6392f5i4qxlv003m126skfk6fnlfq8hn"; sha256 = "0xxx0xpxhrhlhi2axq9867zqrhwqavc1qrr833k1xr0pvm5m0aqc";
}; };
preConfigure = '' preConfigure = ''
@ -18,9 +17,10 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c sed -i 's/~root/~nobody/g' test/helper-expand.c
''; '';
buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo
cairo libstartup_notification libxcb xcbutil xcbutilwm libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm
] ++ stdenv.lib.optional i3Support i3; ];
doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Window switcher, run dialog and dmenu replacement"; description = "Window switcher, run dialog and dmenu replacement";

22
pkgs/servers/x11/xorg/xcb-util-xrm.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }:
stdenv.mkDerivation rec {
version = "1.0";
name = "xcb-util-xrm-${version}";
src = fetchurl {
url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2";
sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l";
};
buildInputs = [ pkgconfig m4 libxcb xcbutil ]
++ stdenv.lib.optional doCheck [ libX11 ];
doCheck = true;
meta = with stdenv.lib; {
description = "XCB utility functions for the X resource manager";
homepage = https://github.com/Airblader/xcb-util-xrm;
license = licenses.mit; # X11 variant
platforms = with platforms; unix;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -9746,6 +9746,8 @@ in
xcb-util-cursor = xorg.xcbutilcursor; xcb-util-cursor = xorg.xcbutilcursor;
xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };
xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { };
xdo = callPackage ../tools/misc/xdo { }; xdo = callPackage ../tools/misc/xdo { };
xineLib = callPackage ../development/libraries/xine-lib { xineLib = callPackage ../development/libraries/xine-lib {