Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.

pkgs/applications/audio/audacity/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
   libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame,
-  expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */
+  expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
   }:
 
 stdenv.mkDerivation rec {
@@ -19,11 +19,13 @@ stdenv.mkDerivation rec {
     rm -r lib-src-rm/
   '';
 
+  configureFlags = "--with-libsamplerate";
+
   buildInputs = [
     pkgconfig gettext wxGTK gtk expat alsaLib
     libsndfile soxr libid3tag
-    ffmpeg libmad lame libvorbis flac
-  ]; #ToDo: soundtouch, detach sbsms
+    ffmpeg libmad lame libvorbis flac soundtouch
+  ]; #ToDo: detach sbsms
 
   dontDisableStatic = true;
   doCheck = true;