diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 7d3c5187321..f2e2a130c0a 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,32 +1,27 @@ { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, libsamplerate, flac, lame, - expat, id3lib, ffmpeg + expat, id3lib, ffmpeg, portaudio }: stdenv.mkDerivation rec { - version = "1.3.12"; + version = "1.3.13"; name = "audacity-${version}"; NIX_CFLAGS_COMPILE = "-fPIC -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lz"; src = fetchurl { url = "mirror://sourceforge/audacity/audacity-minsrc-${version}-beta.tar.bz2"; - sha256 = "f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768"; + sha256 = "4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83"; }; buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl libogg libvorbis libmad alsaLib libsndfile libsamplerate flac lame - expat id3lib ffmpeg]; + expat id3lib ffmpeg portaudio]; configureFlags = [ - "--with-portmixer=no" ]; dontDisableStatic = true; - preBuild = '' - (cd lib-src ; make portaudio-v19/lib/libportaudio.a ; ln -sf portaudio-v19/lib/.libs/libportaudio.a portaudio-v19/lib/libportaudio.a) - ''; - meta = { description = "Sound editor with graphical UI"; homepage = http://audacity.sourceforge.net; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5ffb377bf4..8bafe4c21a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5775,7 +5775,9 @@ let audacious = callPackage ../applications/audio/audacious { }; - audacity = callPackage ../applications/audio/audacity { }; + audacity = callPackage ../applications/audio/audacity { + portaudio = portaudioSVN; + }; aumix = callPackage ../applications/audio/aumix { gtkGUI = false;