diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
| commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
| tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /pkgs/applications/audio/audacity/default.nix | |
| parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
| parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
| download | nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixpkgs-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip | |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'pkgs/applications/audio/audacity/default.nix')
| -rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 67ec6b5a419..6f25693f734 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, soundtouch /*, portaudio - given up fighting their portaudio.patch */ + expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */ }: stdenv.mkDerivation rec { @@ -19,13 +19,11 @@ 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 soundtouch - ]; #ToDo: detach sbsms + ffmpeg libmad lame libvorbis flac + ]; #ToDo: soundtouch, detach sbsms dontDisableStatic = true; doCheck = true; |