@@ -1,17 +1,21 @@
1−{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }:
1+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
22
3−stdenv.mkDerivation {
4− name = "jackmix-0.5.2";
5− src = fetchurl {
6− url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz";
7− sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
3+mkDerivation rec {
4+ pname = "jackmix";
5+ version = "0.6.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "kampfschlaefer";
9+ repo = "jackmix";
10+ rev = version;
11+ sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
812 };
913
1014 patches = [ ./no_error.patch ];
1115
1216 nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ];
1317 buildInputs = [
14− qt4
18+ qtbase
1519 lash
1620 jack
1721 alsaLib
@@ -21,11 +25,11 @@ stdenv.mkDerivation {
2125 install -D jackmix/jackmix $out/bin/jackmix
2226 '';
2327
24− meta = {
28+ meta = with lib; {
2529 description = "Matrix-Mixer for the Jack-Audio-connection-Kit";
26− homepage = "http://www.arnoldarts.de/jackmix/";
27− license = stdenv.lib.licenses.gpl2;
28− maintainers = [ stdenv.lib.maintainers.kampfschlaefer ];
29− platforms = stdenv.lib.platforms.linux;
30+ homepage = "https://github.com/kampfschlaefer/jackmix";
31+ license = licenses.gpl2Only;
32+ maintainers = with maintainers; [ kampfschlaefer ];
33+ platforms = platforms.linux;
3034 };
3135}