git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93761 from raboof/audacity-2.4.1-to-2.4.2

audacity: 2.4.1 -> 2.4.2

commit0bf86fb483b9031c92e768373e7c9b82a3fa356b authorMaximilian Bosch <maximilian@mbosch.me> dateMon 27 Jul 2020, 00:37 (6 years ago) parent0eef66a20872cb
1 file changed+9−15
pkgs/applications/audio/audacity/default.nix+9−15
pkgs/applications/audio/audacity/default.nix+9−15
@@ -1,28 +1,21 @@
1−{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
1+{ stdenv, fetchzip, wxGTK31, pkgconfig, file, gettext,
22 libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
33 expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
4− autoconf, automake, libtool
4+ pcre, vamp-plugin-sdk, portmidi, twolame, git,
5+ cmake, libtool
56 }:
67
78with stdenv.lib;
89
910stdenv.mkDerivation rec {
10− version = "2.4.1";
11+ version = "2.4.2";
1112 pname = "audacity";
1213
1314 src = fetchzip {
1415 url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
15− sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn";
16+ sha256 = "0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546";
1617 };
1718
18− preConfigure = /* we prefer system-wide libs */ ''
19− autoreconf -vi # use system libraries
20−
21− # we will get a (possibly harmless) warning during configure without this
22− substituteInPlace configure \
23− --replace /usr/bin/file ${file}/bin/file
24− '';
25−
2619 configureFlags = [
2720 "--with-libsamplerate"
2821 ];
@@ -43,11 +36,12 @@ stdenv.mkDerivation rec {
4336 "-lswscale"
4437 ];
4538
46− nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
39+ nativeBuildInputs = [ pkgconfig cmake libtool git ];
4740 buildInputs = [
48− file gettext wxGTK30 expat alsaLib
49− libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
41+ file gettext wxGTK31 expat alsaLib
42+ libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK31.gtk
5043 ffmpeg_3 libmad lame libvorbis flac soundtouch
44+ pcre vamp-plugin-sdk portmidi twolame
5145 ]; #ToDo: detach sbsms
5246
5347 enableParallelBuilding = true;