Merge staging into closure-size

1 files changed, 23 insertions, 8 deletions

diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 6aceef78eea2f..8e3cf899e40b4 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -1,19 +1,34 @@
-{ stdenv, fetchurl, libogg }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
 
 stdenv.mkDerivation rec {
-  name = "speex-1.2rc1";
+  name = "speex-1.2rc2";
 
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
-    sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
+    sha256 = "14g8ph39inkrif749lzjm089g7kwk0hymq1a3i9ch5gz8xr7r8na";
   };
 
-  buildInputs = [ libogg ];
+  postPatch = ''
+    sed -i '/AC_CONFIG_MACRO_DIR/i PKG_PROG_PKG_CONFIG' configure.ac
+  '';
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
-  meta = {
-    homepage = http://www.speex.org/;
-    description = "A audio compression codec designed for speech";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fftw speexdsp ];
+
+  # TODO: Remove this will help with immediate backward compatability
+  propagatedBuildInputs = [ speexdsp ];
+
+  configureFlags = [
+    "--with-fft=gpl-fftw3"
+  ];
+
+  meta = with stdenv.lib; {
+    hompage = http://www.speex.org/;
+    description = "an Open Source/Free Software patent-free audio compression format designed for speech";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }