diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 88d4b8360a5..8f553eb4b55 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 15b70117b89..54e7820ec4c 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 ];