From 4836d085e453cb460afa16d26da9057f45513852 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 9 Oct 2022 12:46:50 +0200
Subject: [PATCH] audacity: deprecate wxGTK31 and gtk2

---
 pkgs/applications/audio/audacity/default.nix | 22 +++++---------------
 pkgs/top-level/aliases.nix                   |  2 ++
 pkgs/top-level/all-packages.nix              |  2 --
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index f4846308144c..733368c115c4 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -47,7 +47,8 @@
 , libxkbcommon
 , util-linux
 , wavpack
-, wxGTK31
+, wxGTK32
+, gtk3
 , libpng
 , libjpeg
 , AppKit
@@ -60,25 +61,12 @@
 }:
 
 # TODO
-# 1. as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions
-# 2. detach sbsms
+# 1. detach sbsms
 
 let
   inherit (lib) optionals;
   pname = "audacity";
   version = "3.2.1";
-
-  wxGTK' = if stdenv.isDarwin then wxGTK31 else
-  wxGTK31.overrideAttrs (oldAttrs: rec {
-    version = "3.1.3.1-${pname}";
-    src = fetchFromGitHub {
-      owner = pname;
-      repo = "wxWidgets";
-      rev = "v${version}";
-      sha256 = "sha256-1gO86/uIoo97v2KzJ7iz/hou6Fji3RkL9fM23DWyg/w=";
-      fetchSubmodules = true;
-    };
-  });
 in
 stdenv.mkDerivation rec {
   inherit pname version;
@@ -112,6 +100,7 @@ stdenv.mkDerivation rec {
     ffmpeg_4
     file
     flac
+    gtk3
     lame
     libid3tag
     libjack2
@@ -135,8 +124,7 @@ stdenv.mkDerivation rec {
     twolame
     portaudio
     wavpack
-    wxGTK'
-    wxGTK'.gtk
+    wxGTK32
   ] ++ optionals stdenv.isLinux [
     alsa-lib # for portaudio
     at-spi2-core
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9cad7bdda5cd..2ef122ba137d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -87,6 +87,8 @@ mapAliases ({
   asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06
   at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22
   at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22
+  audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09
+  audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09
   automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30
   avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2022-09-24
   awesome-4-0 = awesome; # Added 2022-05-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f93e83bdfea6..32a9eef7a115 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26914,8 +26914,6 @@ with pkgs;
   };
   audaciousQt5 = audacious;
 
-  audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK31 = wxGTK31-gtk2; };
-  audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK31 = wxGTK31-gtk3; };
   audacity = callPackage ../applications/audio/audacity {
     inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices;
     suil = suil-qt5;