diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-21 15:09:31 +0200 |
commit | d4e9fd2a906b5227ae51a522a0708a0b6884ed1c (patch) | |
tree | ca6bb53bb064b71b5ad9bf94dbcc27c47c2d652c /pkgs/applications/window-managers/bar/default.nix | |
parent | 5c53f22492511d1d8de46ecd8f11fca20f1287fd (diff) | |
parent | 2d03fbf75202272f37bf648d06922c2c624f126a (diff) | |
download | nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.gz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.bz2 nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.lz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.xz nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.tar.zst nixlib-d4e9fd2a906b5227ae51a522a0708a0b6884ed1c.zip |
Merge recent master into staging
Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix
Diffstat (limited to 'pkgs/applications/window-managers/bar/default.nix')
-rw-r--r-- | pkgs/applications/window-managers/bar/default.nix | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix index a4b90a04133b..bee774d10da2 100644 --- a/pkgs/applications/window-managers/bar/default.nix +++ b/pkgs/applications/window-managers/bar/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, git, perl, libxcb, libXinerama, xcbutil, xcbutilwm, xcbutilkeysyms }: - -stdenv.mkDerivation rec { - name = "bar-1.0"; +{ stdenv, fetchurl, perl, libxcb }: +let + version = "1.0"; +in + stdenv.mkDerivation rec { + name = "bar-${version}"; - src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.0.tar.gz"; - sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc"; - }; - - buildInputs = [ libxcb git perl libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; - - 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; - }; + src = fetchurl { + url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz"; + sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc"; + }; + + 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; + }; } |