git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #102124 from helsinki-systems/upd/jackmix

jackmix: 0.5.2 -> 0.6.0

commit9706108b63cb59f046b094da5f684c990ec1c16d authorajs124 <ajs124@users.noreply.github.com> dateTue 17 Nov 2020, 16:13 (6 years ago) parent490342f5949927
3 files changed+26−22
pkgs/applications/audio/jackmix/default.nix+16−12 pkgs/applications/audio/jackmix/no_error.patch+9−9 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/audio/jackmix/default.nix+16−12
@@ -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}
pkgs/applications/audio/jackmix/no_error.patch+9−9
@@ -1,13 +1,13 @@
11diff --git a/SConstruct b/SConstruct
2−index 4290fa5..0a7a679 100644
2+index 8bf6517..a432aa9 100644
33--- a/SConstruct
44+++ b/SConstruct
55@@ -16,7 +16,7 @@ env = Environment(
6− env.Replace( LIBS="" )
7− env.Replace( LIBPATH="" )
8−
9−-env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] )
10−+env.MergeFlags( ['-g', '-fpic'] )
11−
12− tests = { }
13− tests.update( env['PKGCONFIG_TESTS'] )
6+ env.Replace(LIBS="")
7+ env.Replace(LIBPATH="")
8+
9+-env.MergeFlags(['-Wall', '-Werror', '-g', '-fpic', '-std=c++11'])
10++env.MergeFlags(['-g', '-fpic', '-std=c++11'])
11+
12+ tests = {}
13+ tests.update(env['PKGCONFIG_TESTS'])
pkgs/top-level/all-packages.nix+1−1
@@ -21849,7 +21849,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
2184921849
2185021850 jackmeter = callPackage ../applications/audio/jackmeter { };
2185121851
21852− jackmix = callPackage ../applications/audio/jackmix { };
21852+ jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
2185321853 jackmix_jack1 = jackmix.override { jack = jack1; };
2185421854
2185521855 jalv = callPackage ../applications/audio/jalv { };