From f7d9b2016cd4bd81e08cffafd53985c2454fa399 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 22 May 2021 22:05:03 +0800 Subject: [PATCH 1/2] lemonbar-xft: 2016-02-17 -> 2020-09-10, cleanup --- .../window-managers/lemonbar/xft.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index b318b39709a7..15b70117b89f 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,23 +1,25 @@ { lib, stdenv, fetchFromGitHub, perl, libxcb, libXft }: stdenv.mkDerivation { - name = "lemonbar-xft-unstable-2016-02-17"; + pname = "lemonbar-xft"; + version = "unstable-2020-09-10"; src = fetchFromGitHub { - owner = "krypt-n"; - repo = "bar"; - rev = "a43b801ddc0f015ce8b1211f4c062fad12cd63a9"; - sha256 = "0iqas07qjvabxyvna2m9aj5bcwnkdii1izl9jxha63vz0zlsc4gd"; + owner = "drscream"; + repo = "lemonbar-xft"; + rev = "481e12363e2a0fe0ddd2176a8e003392be90ed02"; + sha256 = "sha256-BNYBbUouqqsRQaPkpg+UKg62IV9uI34gKJuiAM94CBU="; }; buildInputs = [ libxcb libXft perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - meta = { + meta = with lib; { description = "A lightweight xcb based bar with XFT-support"; - homepage = "https://github.com/krypt-n/bar"; - license = "Custom"; - platforms = lib.platforms.linux; + homepage = "https://github.com/drscream/bar"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ fortuneteller2k ]; }; } From 0331c3ecf479d03583c5caef857ede429d828806 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 22 May 2021 22:08:21 +0800 Subject: [PATCH 2/2] lemonbar: use fetchFromGithub, cleanup Co-authored-by: Sandro --- .../window-managers/lemonbar/default.nix | 21 +++++++++++-------- .../window-managers/lemonbar/xft.nix | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 88d4b8360a50..8f553eb4b554 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchurl, perl, libxcb }: +{ lib, stdenv, fetchFromGitHub, perl, libxcb }: -stdenv.mkDerivation { - name = "lemonbar-1.4"; +stdenv.mkDerivation rec { + pname = "lemonbar"; + version = "1.4"; - src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; - sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; + src = fetchFromGitHub { + owner = "LemonBoy"; + repo = "bar"; + rev = "v${version}"; + sha256 = "sha256-lmppcnQ8r4jEuhegpTBxYqxfTTS/IrbtQVZ44HqnoWo="; }; buildInputs = [ libxcb perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; - maintainers = [ maintainers.meisternu ]; - license = "Custom"; + maintainers = with maintainers; [ meisternu fortuneteller2k ]; + license = licenses.mit; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index 15b70117b89f..54e7820ec4c2 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A lightweight xcb based bar with XFT-support"; - homepage = "https://github.com/drscream/bar"; + homepage = "https://github.com/drscream/lemonbar-xft"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fortuneteller2k ];