diff options
author | Domen Kožar <domen@dev.si> | 2016-01-17 12:46:29 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2016-01-17 12:46:29 +0100 |
commit | 64d305245dc5776ef631ea353d73f4c256fe52d7 (patch) | |
tree | 808920a4e83d20059d4a36a573211d5dc99ff65d /pkgs/applications | |
parent | 30cf0be24b778f4a57cbed452492b31dfe9ed620 (diff) | |
parent | 9ed945784630b5c3cfcae5fdba04c88fb4286a60 (diff) | |
download | nixlib-64d305245dc5776ef631ea353d73f4c256fe52d7.tar nixlib-64d305245dc5776ef631ea353d73f4c256fe52d7.tar.gz nixlib-64d305245dc5776ef631ea353d73f4c256fe52d7.tar.bz2 nixlib-64d305245dc5776ef631ea353d73f4c256fe52d7.tar.lz nixlib-64d305245dc5776ef631ea353d73f4c256fe52d7.tar.xz nixlib-64d305245dc5776ef631ea353d73f4c256fe52d7.tar.zst nixlib-64d305245dc5776ef631ea353d73f4c256fe52d7.zip |
Merge pull request #12424 from k0ral/lemonbar
lemonbar: 1.1 -> 1.2pre
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/window-managers/bar/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/window-managers/lemonbar/default.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/window-managers/lemonbar/xft.nix (renamed from pkgs/applications/window-managers/bar/xft.nix) | 0 |
3 files changed, 27 insertions, 25 deletions
diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix deleted file mode 100644 index 964390d3b59b..000000000000 --- a/pkgs/applications/window-managers/bar/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix new file mode 100644 index 000000000000..042abf09dad2 --- /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/bar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index c671f1a4e037..c671f1a4e037 100644 --- a/pkgs/applications/window-managers/bar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix |