public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jackmix: 0.5.2 -> 0.6.0 

also qt4 -> qt5
This commit is contained in:
ajs124 2020-10-30 02:52:34 +01:00
parent 27f705def2
commit 5949927de4
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

18
pkgs/applications/audio/jackmix/no_error.patch
View File

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

2
pkgs/top-level/all-packages.nix
View File

@ -21625,7 +21625,7 @@ in
jackmeter = callPackage ../applications/audio/jackmeter { }; jackmeter = callPackage ../applications/audio/jackmeter { };
jackmix = callPackage ../applications/audio/jackmix { }; jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
jackmix_jack1 = jackmix.override { jack = jack1; }; jackmix_jack1 = jackmix.override { jack = jack1; };
jalv = callPackage ../applications/audio/jalv { }; jalv = callPackage ../applications/audio/jalv { };