Merge pull request #12424 from k0ral/lemonbar

lemonbar: 1.1 -> 1.2pre
This commit is contained in:
Domen Kožar 2016-01-17 12:46:29 +01:00
commit 64d305245d
4 changed files with 33 additions and 29 deletions

View File

@ -1,25 +0,0 @@
{ stdenv, fetchurl, perl, libxcb }:
let
version = "1.1";
in
stdenv.mkDerivation rec {
name = "bar-${version}";
src = fetchurl {
url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan";
};
buildInputs = [ libxcb perl ];
prePatch = ''sed -i "s@/usr@$out@" Makefile'';
meta = {
description = "A lightweight xcb based bar";
homepage = https://github.com/LemonBoy/bar;
maintainers = [ stdenv.lib.maintainers.meisternu ];
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -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;
};
}

View File

@ -11150,10 +11150,6 @@ let
bandwidth = callPackage ../tools/misc/bandwidth { };
bar = callPackage ../applications/window-managers/bar { };
bar-xft = callPackage ../applications/window-managers/bar/xft.nix { };
baresip = callPackage ../applications/networking/instant-messengers/baresip {
ffmpeg = ffmpeg_1;
};
@ -12337,6 +12333,10 @@ let
inherit (gnome) libglade;
};
lemonbar = callPackage ../applications/window-managers/lemonbar { };
lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
leo-editor = callPackage ../applications/editors/leo-editor { };
libowfat = callPackage ../development/libraries/libowfat { };
@ -15796,6 +15796,8 @@ aliases = with self; rec {
adobeReader = adobe-reader;
arduino_core = arduino-core; # added 2015-02-04
asciidocFull = asciidoc-full; # added 2014-06-22
bar = lemonbar; # added 2015-01-16
bar-xft = lemonbar-xft; # added 2015-01-16
bridge_utils = bridge-utils; # added 2015-02-20
buildbotSlave = buildbot-slave; # added 2014-12-09
cheetahTemplate = pythonPackages.cheetah; # 2015-06-15