From 7c578a1d3f17d15e683c01e26b4ec8a051de543e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Dec 2021 18:14:53 -0500 Subject: [PATCH] audacity: configure ffmpeg linking via cmake flags --- pkgs/applications/audio/audacity/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index a8ab856ed671..43f23f3a628f 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -109,19 +109,6 @@ stdenv.mkDerivation rec { --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h ''; - # audacity only looks for ffmpeg at runtime, so we need to link it in manually - NIX_LDFLAGS = toString [ - "-lavcodec" - "-lavdevice" - "-lavfilter" - "-lavformat" - "-lavresample" - "-lavutil" - "-lpostproc" - "-lswresample" - "-lswscale" - ]; - nativeBuildInputs = [ cmake gettext @@ -175,6 +162,11 @@ stdenv.mkDerivation rec { AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio ]; + cmakeFlags = [ + "-Daudacity_use_ffmpeg=linked" + "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" + ]; + doCheck = false; # Test fails meta = with lib; {