summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorfortuneteller2k <lythe1107@gmail.com>2021-05-22 22:08:21 +0800
committerfortuneteller2k <lythe1107@gmail.com>2021-05-22 23:01:00 +0800
commit0331c3ecf479d03583c5caef857ede429d828806 (patch)
tree2b90657eb8fa0fa39756f7546040c79a6631c360 /pkgs/applications/window-managers
parentf7d9b2016cd4bd81e08cffafd53985c2454fa399 (diff)
downloadnixpkgs-0331c3ecf479d03583c5caef857ede429d828806.tar
nixpkgs-0331c3ecf479d03583c5caef857ede429d828806.tar.gz
nixpkgs-0331c3ecf479d03583c5caef857ede429d828806.tar.bz2
nixpkgs-0331c3ecf479d03583c5caef857ede429d828806.tar.lz
nixpkgs-0331c3ecf479d03583c5caef857ede429d828806.tar.xz
nixpkgs-0331c3ecf479d03583c5caef857ede429d828806.tar.zst
nixpkgs-0331c3ecf479d03583c5caef857ede429d828806.zip
lemonbar: use fetchFromGithub, cleanup
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/lemonbar/default.nix21
-rw-r--r--pkgs/applications/window-managers/lemonbar/xft.nix2
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 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 ];