From 8b4392094f0abc96dfe5ee01c1328a4faf0b9321 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Tue, 29 Aug 2017 21:45:08 +0200 Subject: [PATCH] jackmix: don't fail on deprecated definitions --- pkgs/applications/audio/jackmix/default.nix | 4 ++-- pkgs/applications/audio/jackmix/no_error.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/jackmix/no_error.patch diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index e9e3fd53e546..f0cd3bd04279 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 000000000000..d1a714ded9ca --- /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'] )