From deba67f2b3cae8f15197b7b14c1b1580758464d7 Mon Sep 17 00:00:00 2001 From: xd1le Date: Sat, 7 Oct 2017 21:26:25 +1100 Subject: [PATCH] sxhkd: 0.5.6 -> 0.5.8 (#30184) * sxhkd: code style nitpicks * sxhkd: add vyp as maintainer * sxhkd: use list instead of string for makeFlags * sxhkd: use fetchFromGitHub instead of fetchurl * sxhkd: 0.5.6 -> 0.5.8 --- .../window-managers/sxhkd/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 41a50668f19b..cca9f1c6ac58 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }: +{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms +, xcbutilwm +}: stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.5.6"; + version = "0.5.8"; - src = fetchurl { - url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz"; - sha256 = "15grmzpxz5fqlbfg2slj7gb7r6nzkvjmflmbkqx7mlby9pm6wdkj"; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "sxhkd"; + rev = version; + sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; - makeFlags = ''PREFIX=$(out)''; + makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "Simple X hotkey daemon"; - homepage = https://github.com/baskerville/sxhkd/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/baskerville/sxhkd"; + license = licenses.bsd2; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }