diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index fdb81a88b151..0c362dce60b5 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -1,47 +1,23 @@ -x@{builderDefsPackage - , libX11, xproto - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, libX11, xproto }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="stalonetray"; - version="0.8.1"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}/${name}.tar.bz2"; - hash="1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "stalonetray-${version}"; + version = "0.8.1"; + src = fetchurl { + url = "mirror://sourceforge/stalonetray/${name}.tar.bz2"; + sha256 = "1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll"; }; + buildInputs = [ libX11 xproto ]; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - meta = { + meta = with stdenv.lib; { description = "Stand alone tray"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = with maintainers; [ raskin ]; + platforms = with platforms; linux; }; + passthru = { updateInfo = { downloadPage = "http://sourceforge.net/projects/stalonetray/files/"; }; }; -}) x - +}