cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #64447 from xrelkd/update/rofi

Browse source 
rofi: 1.5.3 -> 1.5.4
This commit is contained in:
worldofpeace 2019-07-08 19:33:54 -04:00 committed by GitHub
commit 5b4e865c5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,16 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git { stdenv, lib, fetchurl
, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, bison, flex, librsvg, check , bison, flex, librsvg, check
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.5.3"; pname = "rofi-unwrapped";
name = "rofi-unwrapped-${version}"; version = "1.5.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz";
sha256 = "1mskknfnpgmaghplwcyc44qc8swb1f9qiyi67fz9i77jijjpj1lx"; sha256 = "1g1170zmh5v7slnm1sm2d08jgz6icikf8rm17apm1bjzzyw1lhk7";
}; };
preConfigure = '' preConfigure = ''
@ -22,11 +23,12 @@ stdenv.mkDerivation rec {
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
]; ];
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with lib; {
description = "Window switcher, run dialog and dmenu replacement"; description = "Window switcher, run dialog and dmenu replacement";
homepage = https://github.com/davatorium/rofi; homepage = "https://github.com/davatorium/rofi";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ mbakke ma27 ]; maintainers = with maintainers; [ mbakke ma27 ];
platforms = with platforms; linux; platforms = with platforms; linux;

4
pkgs/applications/misc/rofi/wrapper.nix
View file

@ -2,7 +2,9 @@
if theme == null then rofi-unwrapped else if theme == null then rofi-unwrapped else
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rofi-${rofi-unwrapped.version}"; pname = "rofi";
version = rofi-unwrapped.version;
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
preferLocalBuild = true; preferLocalBuild = true;
passthru.unwrapped = rofi-unwrapped; passthru.unwrapped = rofi-unwrapped;