public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert #93761: "audacity: 2.4.1 -> 2.4.2"

Browse Source 
This reverts commit 20872cb0ad51bdc0692da404ef5d137f81a5ec3e.
Otherwise it crashes on startup: #94865.
This commit is contained in:
Vladimír Čunát 2020-08-08 13:59:25 +02:00
parent 32b7270c0d
commit 6866904fdb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/audio/audacity/default.nix
View File

@ -1,21 +1,28 @@
{ stdenv, fetchzip, wxGTK31, pkgconfig, file, gettext, { stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
pcre, vamp-plugin-sdk, portmidi, twolame, git, autoconf, automake, libtool
cmake, libtool
}: }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.2"; version = "2.4.1";
pname = "audacity"; pname = "audacity";
src = fetchzip { src = fetchzip {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546"; sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn";
}; };
preConfigure = /* we prefer system-wide libs */ ''
autoreconf -vi # use system libraries
# we will get a (possibly harmless) warning during configure without this
substituteInPlace configure \
--replace /usr/bin/file ${file}/bin/file
'';
configureFlags = [ configureFlags = [
"--with-libsamplerate" "--with-libsamplerate"
]; ];
@ -36,12 +43,11 @@ stdenv.mkDerivation rec {
"-lswscale" "-lswscale"
]; ];
nativeBuildInputs = [ pkgconfig cmake libtool git ]; nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
buildInputs = [ buildInputs = [
file gettext wxGTK31 expat alsaLib file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK31.gtk libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
ffmpeg_3 libmad lame libvorbis flac soundtouch ffmpeg_3 libmad lame libvorbis flac soundtouch
pcre vamp-plugin-sdk portmidi twolame
]; #ToDo: detach sbsms ]; #ToDo: detach sbsms
enableParallelBuilding = true; enableParallelBuilding = true;