diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-01 01:55:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-01 01:55:24 +0100 |
commit | 9f33d6589afc83fc32098fa788cbf082258243af (patch) | |
tree | 3134bb5fea324bd58d391f0bb602b8a997d3b040 /pkgs/applications | |
parent | 344921c8e3014d7a114df12393b20933f8006690 (diff) | |
parent | de1d520b58f2d9d771e54492dfda8b8981c9500d (diff) | |
download | nixlib-9f33d6589afc83fc32098fa788cbf082258243af.tar nixlib-9f33d6589afc83fc32098fa788cbf082258243af.tar.gz nixlib-9f33d6589afc83fc32098fa788cbf082258243af.tar.bz2 nixlib-9f33d6589afc83fc32098fa788cbf082258243af.tar.lz nixlib-9f33d6589afc83fc32098fa788cbf082258243af.tar.xz nixlib-9f33d6589afc83fc32098fa788cbf082258243af.tar.zst nixlib-9f33d6589afc83fc32098fa788cbf082258243af.zip |
Merge pull request #107465 from Gerschtli/fix/audacity
audacity: switch to cmake to fix missing plug-ins
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 20526c8c6c56..1a29ed8b9785 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, 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 */ - autoconf, automake, libtool - }: + cmake +}: with stdenv.lib; @@ -15,16 +15,8 @@ stdenv.mkDerivation rec { 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 = [ - "--with-libsamplerate" + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" ]; # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually @@ -43,15 +35,13 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk ffmpeg_3 libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms - enableParallelBuilding = true; - dontDisableStatic = true; doCheck = false; # Test fails |