From 55d822c512b9e995927a5ef203721ae1d111b651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Thu, 3 Sep 2015 14:22:13 +0200
Subject: [PATCH] jack2: apply patch to fix build with gcc5

---
 pkgs/misc/jackaudio/default.nix     |  4 +++-
 pkgs/misc/jackaudio/jack-gcc5.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/jackaudio/jack-gcc5.patch

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 47511cf58b0e..25fd1a5cbbf7 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -41,10 +41,12 @@ stdenv.mkDerivation rec {
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];
 
-  patchPhase = ''
+  prePatch = ''
     substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
   '';
 
+  patches = [ ./jack-gcc5.patch ];
+
   configurePhase = ''
     python waf configure --prefix=$out \
       ${optionalString (optDbus != null) "--dbus"} \
diff --git a/pkgs/misc/jackaudio/jack-gcc5.patch b/pkgs/misc/jackaudio/jack-gcc5.patch
new file mode 100644
index 000000000000..f18042c6e32c
--- /dev/null
+++ b/pkgs/misc/jackaudio/jack-gcc5.patch
@@ -0,0 +1,26 @@
+From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
+From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
+Date: Thu, 18 Sep 2014 18:29:23 +0200
+Subject: [PATCH] Fix FTBFS with clang++
+
+Forwarded from http://bugs.debian.org/757820
+---
+ common/memops.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/memops.c b/common/memops.c
+index 27f6194..2d416b6 100644
+--- a/common/memops.c
++++ b/common/memops.c
+@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
+  */
+ static unsigned int seed = 22222;
+ 
+-inline unsigned int fast_rand() {
++static inline unsigned int fast_rand() {
+ 	seed = (seed * 96314165) + 907633515;
+ 	return seed;
+ }
+-- 
+2.4.0
+