From 6a84883df0b6a4a08567de2f813d0a878de672f6 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 31 Jul 2022 17:25:06 +0200 Subject: [PATCH] volumeicon: use github as source Currently http://softwarebakery.com/maato is down. The alternative is also based on http, not https. It seems nicer to use github. In order to use GitHub as the source, autogen.sh needs to be executed. --- pkgs/tools/audio/volumeicon/default.nix | 34 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 4d726cbd2a9e..00690d016329 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -1,24 +1,36 @@ -{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsa-lib }: +{ fetchFromGitHub, lib, stdenv +, autoreconfHook, intltool, pkg-config +, gtk3, alsa-lib +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "volumeicon"; version = "0.5.1"; - src = fetchurl { - url = "http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.1.tar.gz"; - sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14"; + src = fetchFromGitHub { + owner = "Maato"; + repo = "volumeicon"; + rev = version; + hash = "sha256-zYKC7rOoLf08rV4B43TrGNBcXfSBFxWZCe9bQD9JzaA"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool alsa-lib ]; + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + ]; + + buildInputs = [ + gtk3 + alsa-lib + ]; meta = with lib; { description = "A lightweight volume control that sits in your systray"; - homepage = "http://softwarebakery.com/maato/volumeicon.html"; - platforms = pkgs.lib.platforms.linux; + homepage = "http://nullwise.com/volumeicon.html"; + platforms = platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; - license = pkgs.lib.licenses.gpl3; + license = licenses.gpl3; }; - }