From 23560314f4f75ab1a691181fff19f3bb274b6b05 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 23 Aug 2016 15:47:53 +0200
Subject: darkice: 1.2 -> 1.3

---
 pkgs/tools/audio/darkice/default.nix                  |  8 ++++++--
 pkgs/tools/audio/darkice/fix-undeclared-memmove.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/audio/darkice/fix-undeclared-memmove.patch

(limited to 'pkgs/tools/audio/darkice')

diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index 8ac9039b57e0..d9e1d196915f 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "darkice-${version}";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz";
-    sha256 = "0m5jzmja7a9x15zl1634bhxrg3rccph9rkar0rmz6wlw5nzakyxk";
+    sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
   };
 
   configureFlags = [
@@ -40,6 +40,10 @@ in stdenv.mkDerivation rec {
 #    "--with-twolame-prefix=${twolame}" ### missing: twolame
   ];
 
+  patches = [ ./fix-undeclared-memmove.patch ];
+
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://darkice.org/;
     description = "Live audio streamer";
diff --git a/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch b/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
new file mode 100644
index 000000000000..9b8baf9701d3
--- /dev/null
+++ b/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
@@ -0,0 +1,13 @@
+diff --git a/src/FaacEncoder.cpp b/src/FaacEncoder.cpp
+index 1100226..3ab1805 100644
+--- a/src/FaacEncoder.cpp
++++ b/src/FaacEncoder.cpp
+@@ -36,7 +36,7 @@
+ // compile the whole file only if faac support configured in
+ #ifdef HAVE_FAAC_LIB
+ 
+-
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Util.h"
-- 
cgit 1.4.1