From a7ad48d91a50307bc4f7ef3801f572f234808809 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 20:25:18 +0200 Subject: [PATCH] audacity: move override into package.nix --- pkgs/by-name/au/audacity/package.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 6d1b67a6dd2c..55c926e91fbe 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -31,7 +31,7 @@ libid3tag, libopus, libuuid, - ffmpeg, + ffmpeg_7, soundtouch, portaudio, # given up fighting their portaudio.patch? portmidi, @@ -58,6 +58,9 @@ # TODO # 1. detach sbsms +let + ffmpeg = ffmpeg_7; +in stdenv.mkDerivation (finalAttrs: { pname = "audacity"; version = "3.7.7"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 734fce603364..a87346178166 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9864,10 +9864,6 @@ with pkgs; audacious = audacious-bare.override { withPlugins = true; }; - audacity = callPackage ../by-name/au/audacity/package.nix { - ffmpeg = ffmpeg_7; - }; - bambootracker-qt6 = bambootracker.override { withQt6 = true; }; awesome = callPackage ../applications/window-managers/awesome {