diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
| commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
| tree | 07065424002052ed9e726b4feb689697845ff4a7 /pkgs/applications/audio/audacity | |
| parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) | |
| download | nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.gz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.bz2 nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.lz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.xz nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.tar.zst nixpkgs-6602f49495c94e8533c8b482698bcf570a8d8933.zip | |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
Diffstat (limited to 'pkgs/applications/audio/audacity')
| -rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6f25693f734..67ec6b5a419 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/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; |