Merge pull request #102124 from helsinki-systems/upd/jackmix

jackmix: 0.5.2 -> 0.6.0
This commit is contained in:
ajs124 2020-11-17 16:13:47 +01:00 committed by GitHub
commit 9706108b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 22 deletions

View file

@ -1,17 +1,21 @@
{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }:
{ mkDerivation, lib, fetchFromGitHub, pkgconfig, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
stdenv.mkDerivation {
name = "jackmix-0.5.2";
src = fetchurl {
url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz";
sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
mkDerivation rec {
pname = "jackmix";
version = "0.6.0";
src = fetchFromGitHub {
owner = "kampfschlaefer";
repo = "jackmix";
rev = version;
sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
};
patches = [ ./no_error.patch ];
nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ];
buildInputs = [
qt4
qtbase
lash
jack
alsaLib
@ -21,11 +25,11 @@ stdenv.mkDerivation {
install -D jackmix/jackmix $out/bin/jackmix
'';
meta = {
meta = with lib; {
description = "Matrix-Mixer for the Jack-Audio-connection-Kit";
homepage = "http://www.arnoldarts.de/jackmix/";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.kampfschlaefer ];
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/kampfschlaefer/jackmix";
license = licenses.gpl2Only;
maintainers = with maintainers; [ kampfschlaefer ];
platforms = platforms.linux;
};
}

View file

@ -1,13 +1,13 @@
diff --git a/SConstruct b/SConstruct
index 4290fa5..0a7a679 100644
index 8bf6517..a432aa9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ env = Environment(
env.Replace( LIBS="" )
env.Replace( LIBPATH="" )
-env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] )
+env.MergeFlags( ['-g', '-fpic'] )
tests = { }
tests.update( env['PKGCONFIG_TESTS'] )
env.Replace(LIBS="")
env.Replace(LIBPATH="")
-env.MergeFlags(['-Wall', '-Werror', '-g', '-fpic', '-std=c++11'])
+env.MergeFlags(['-g', '-fpic', '-std=c++11'])
tests = {}
tests.update(env['PKGCONFIG_TESTS'])

View file

@ -21849,7 +21849,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
jackmeter = callPackage ../applications/audio/jackmeter { };
jackmix = callPackage ../applications/audio/jackmix { };
jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
jackmix_jack1 = jackmix.override { jack = jack1; };
jalv = callPackage ../applications/audio/jalv { };