alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #267963 from wegank/audacity-bump

Browse source 
audacity: 3.4.1 -> 3.4.2
This commit is contained in:
Weijia Wang 2023-11-20 08:54:41 +01:00 committed by GitHub
parent 01c615fb2d 8f69705dba
commit fc69675156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@
, libid3tag
, libopus
, libuuid
, ffmpeg_4
, ffmpeg_6
, soundtouch
, pcre
, portaudio # given up fighting their portaudio.patch?
@ -62,13 +62,13 @@
stdenv.mkDerivation rec {
pname = "audacity";
version = "3.4.1";
version = "3.4.2";
src = fetchFromGitHub {
owner = "audacity";
repo = "audacity";
rev = "Audacity-${version}";
hash = "sha256-g9VdwVRrZrIKd4VUU12C691aM2ilgTJdW5Ic7sokk4M=";
hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ=";
};
postPatch = ''
@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
buildInputs = [
expat
ffmpeg_4
ffmpeg_6
file
flac
gtk3
@ -171,12 +171,15 @@ stdenv.mkDerivation rec {
doCheck = false; # Test fails
dontWrapGApps = true;
# Replace audacity's wrapper, to:
# - put it in the right place, it shouldn't be in "$out/audacity"
# - Add the ffmpeg dynamic dependency
postInstall = lib.optionalString stdenv.isLinux ''
postFixup = lib.optionalString stdenv.isLinux ''
wrapProgram "$out/bin/audacity" \
--prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_4 ]} \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_6 ]} \
--suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \
--suffix AUDACITY_PATH : "$out/share/audacity"
'' + lib.optionalString stdenv.isDarwin ''

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

@ -30478,16 +30478,6 @@ with pkgs;
audacity = callPackage ../applications/audio/audacity {
inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit;
wxGTK32 = wxGTK32.overrideAttrs {
patches = [
(fetchpatch { # required to run audacity 3.3.3 on wxGTK 3.2.4, see PR #266945
url = "https://github.com/wxWidgets/wxWidgets/commit/425d9455e8307c1267a79d47d77e3dafeb4d86de.patch";
excludes = [ "docs/changes.txt" ];
revert = true;
hash = "sha256-6LOYLDLtVCHxNdHAWv3zhlCsljIpi//RJb9XVLGD5hM=";
})
];
};
};
audio-recorder = callPackage ../applications/audio/audio-recorder { };