movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

audacity: 3.2.2 -> 3.2.3 (#208066)

Browse source
This commit is contained in:
Weijia Wang 2022-12-29 01:39:47 +01:00 • committed by GitHub
parent 6c056bed3a
commit 826bc3f074
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
pkgs/applications/audio/audacity/default.nix
View file

@ -53,30 +53,21 @@
, libpng , libpng
, libjpeg , libjpeg
, AppKit , AppKit
, AudioToolbox
, AudioUnit
, Carbon
, CoreAudio
, CoreAudioKit , CoreAudioKit
, CoreServices
}: }:
# TODO # TODO
# 1. detach sbsms # 1. detach sbsms
let
inherit (lib) optionals;
pname = "audacity";
version = "3.2.2";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname version; pname = "audacity";
version = "3.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "Audacity-${version}"; rev = "Audacity-${version}";
sha256 = "sha256-vDkIBsXINo7g8lbDfXYTaz2AB6HWPc5resITllVNd6o="; sha256 = "sha256-0F9+4hyUoKb0UP5t02yws/ErogscvI1nsdnSTpcr53E=";
}; };
postPatch = '' postPatch = ''
@ -84,10 +75,6 @@ stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
substituteInPlace libraries/lib-files/FileNames.cpp \ substituteInPlace libraries/lib-files/FileNames.cpp \
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
''
# error: unknown type name 'NSAppearanceName'
+ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
sed -z -i "s/if (@available(macOS 10.14, \*)).*}/}/g" src/AudacityApp.mm
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -97,7 +84,7 @@ stdenv.mkDerivation rec {
python3 python3
makeWrapper makeWrapper
wrapGAppsHook wrapGAppsHook
] ++ optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
linuxHeaders linuxHeaders
]; ];
@ -106,6 +93,9 @@ stdenv.mkDerivation rec {
ffmpeg_4 ffmpeg_4
file file
flac flac
] ++ lib.optionals stdenv.isDarwin [
AppKit
] ++ [
gtk3 gtk3
lame lame
libid3tag libid3tag
@ -131,7 +121,7 @@ stdenv.mkDerivation rec {
portaudio portaudio
wavpack wavpack
wxGTK32 wxGTK32
] ++ optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
alsa-lib # for portaudio alsa-lib # for portaudio
at-spi2-core at-spi2-core
dbus dbus
@ -144,10 +134,8 @@ stdenv.mkDerivation rec {
libsepol libsepol
libuuid libuuid
util-linux util-linux
] ++ optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
AppKit CoreAudioKit # for portaudio
CoreAudioKit
AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio
libpng libpng
libjpeg libjpeg
]; ];

4
pkgs/top-level/all-packages.nix
View file

@ -27739,8 +27739,8 @@ with pkgs;
}; };
audaciousQt5 = audacious; audaciousQt5 = audacious;
audacity = callPackage ../applications/audio/audacity { audacity = darwin.apple_sdk_11_0.callPackage ../applications/audio/audacity {
inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices; inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudioKit;
}; };
audio-recorder = callPackage ../applications/audio/audio-recorder { }; audio-recorder = callPackage ../applications/audio/audio-recorder { };