@@ -1,28 +1,21 @@
1−{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
1+{ stdenv, fetchzip, wxGTK31, pkgconfig, file, gettext,
2 libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
2 libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
3 expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
3 expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
4+ pcre, vamp-plugin-sdk, portmidi, twolame, git,
4− autoconf, automake, libtool
5+ cmake, libtool
7with stdenv.lib;
8with stdenv.lib;
9stdenv.mkDerivation rec {
10stdenv.mkDerivation rec {
10− version = "2.4.1";
11+ version = "2.4.2";
11 pname = "audacity";
12 pname = "audacity";
13 src = fetchzip {
14 src = fetchzip {
14 url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
15 url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
15− sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn";
16+ sha256 = "0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546";
18− preConfigure = /* we prefer system-wide libs */ ''
19− autoreconf -vi # use system libraries
21− # we will get a (possibly harmless) warning during configure without this
22− substituteInPlace configure \
23− --replace /usr/bin/file ${file}/bin/file
26 configureFlags = [
19 configureFlags = [
27 "--with-libsamplerate"
20 "--with-libsamplerate"
@@ -43,11 +36,12 @@ stdenv.mkDerivation rec {
43 "-lswscale"
36 "-lswscale"
46− nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
39+ nativeBuildInputs = [ pkgconfig cmake libtool git ];
47 buildInputs = [
40 buildInputs = [
48− file gettext wxGTK30 expat alsaLib
41+ file gettext wxGTK31 expat alsaLib
49− libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
42+ libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK31.gtk
50 ffmpeg_3 libmad lame libvorbis flac soundtouch
43 ffmpeg_3 libmad lame libvorbis flac soundtouch
44+ pcre vamp-plugin-sdk portmidi twolame
51 ]; #ToDo: detach sbsms
45 ]; #ToDo: detach sbsms
53 enableParallelBuilding = true;
47 enableParallelBuilding = true;