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

audacity: deprecate wxGTK31 and gtk2

Browse Source
This commit is contained in:
Weijia Wang 2022-10-09 12:46:50 +02:00
parent aafc60e4c2
commit 4836d085e4
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

2
pkgs/top-level/aliases.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -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;