summary refs log tree commit diff
path: root/pkgs/applications/audio/jackmix
diff options
context:
space:
mode:
authorArnold Krille <arnold@arnoldarts.de>2017-08-29 21:45:08 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-08-29 22:43:19 +0200
commit8b4392094f0abc96dfe5ee01c1328a4faf0b9321 (patch)
tree5c4451fabc7d3a0e08bd23d1ec9b81c0951d28e2 /pkgs/applications/audio/jackmix
parent3d41279b768f0d7c5a6f7d071337b0dafeedf753 (diff)
downloadnixpkgs-8b4392094f0abc96dfe5ee01c1328a4faf0b9321.tar
nixpkgs-8b4392094f0abc96dfe5ee01c1328a4faf0b9321.tar.gz
nixpkgs-8b4392094f0abc96dfe5ee01c1328a4faf0b9321.tar.bz2
nixpkgs-8b4392094f0abc96dfe5ee01c1328a4faf0b9321.tar.lz
nixpkgs-8b4392094f0abc96dfe5ee01c1328a4faf0b9321.tar.xz
nixpkgs-8b4392094f0abc96dfe5ee01c1328a4faf0b9321.tar.zst
nixpkgs-8b4392094f0abc96dfe5ee01c1328a4faf0b9321.zip
jackmix: don't fail on deprecated definitions
Diffstat (limited to 'pkgs/applications/audio/jackmix')
-rw-r--r--pkgs/applications/audio/jackmix/default.nix4
-rw-r--r--pkgs/applications/audio/jackmix/no_error.patch13
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index e9e3fd53e54..f0cd3bd0427 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
   };
 
+  patches = [ ./no_error.patch ];
+
   buildInputs = [
     pkgconfig
     scons
@@ -31,5 +33,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
-
-
diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/applications/audio/jackmix/no_error.patch
new file mode 100644
index 00000000000..d1a714ded9c
--- /dev/null
+++ b/pkgs/applications/audio/jackmix/no_error.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index 4290fa5..0a7a679 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'] )