lemonbar: 1.1 -> 1.2pre

'bar' has been officially renamed 'lemonbar'.
Last release (1.1) is almost a year old, but some bugfixes and new features are available in the repository, let's include them in the derivation.

2 files changed, 53 insertions, 0 deletions

diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
new file mode 100644
index 00000000000..042abf09dad
--- /dev/null
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, perl, libxcb }:
+
+let
+  version = "1.2pre";
+in
+  stdenv.mkDerivation rec {
+    name = "lemonbar-${version}";
+  
+    src = fetchFromGitHub {
+      owner = "LemonBoy";
+      repo = "bar";
+      rev = "61985278f2af1e4e85d63a696ffedc5616b06bc0";
+      sha256 = "0a8djlayimjdg5fj50lpifsv6gkb577bca68wmk9wg9y9n27pgay";
+    };
+  
+    buildInputs = [ libxcb perl ];
+  
+    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
+  
+    meta = with stdenv.lib; {
+      description = "A lightweight xcb based bar";
+      homepage = https://github.com/LemonBoy/bar;
+      maintainers = [ maintainers.meisternu ];
+      license = "Custom";   
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
new file mode 100644
index 00000000000..c671f1a4e03
--- /dev/null
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, perl, libxcb, libXft }:
+
+let
+  version = "2015-07-23";
+in
+  stdenv.mkDerivation rec {
+    name = "bar-xft-git-${version}";
+
+    src = fetchgit {
+      url = "https://github.com/krypt-n/bar";
+      rev = "020a3e1848ce03287886e9ff80b0b443e9aed543";
+      sha256 = "1xzs37syhlwyjfxnk36qnij5bqa0mi53lf1k851viw4qai2bfkgr";
+    };
+
+    buildInputs = [ libxcb libXft perl ];
+
+    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
+
+    meta = {
+      description = "A lightweight xcb based bar with XFT-support";
+      homepage = https://github.com/krypt-n/bar;
+      maintainers = [ stdenv.lib.maintainers.hiberno ];
+      license = "Custom";
+      platforms = stdenv.lib.platforms.linux;
+    };
+}