From df8e7f5614abd604426412cd26a980272d9f1cf2 Mon Sep 17 00:00:00 2001 From: Steve Bigham Date: Thu, 14 Aug 2014 21:01:20 -0400 Subject: [PATCH] Remove unnecessary dependencies and centralize version string. --- .../window-managers/bar/default.nix | 42 ++++++++++--------- 1 file 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; + }; }