diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-20 08:54:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-20 08:54:41 +0100 |
| commit | fc69675156fd9e0123368b45dba0e695e61dd52c (patch) | |
| tree | dba6644dcf441868c8b505d2fcd7ad9ec6c14b21 /pkgs/applications/audio | |
| parent | 01c615fb2db939c1b89e4a00b6cfbbd45b7255e6 (diff) | |
| parent | 8f69705dba34cc2f52b9a6d492f48a5d4134853a (diff) | |
Merge pull request #267963 from wegank/audacity-bump
audacity: 3.4.1 -> 3.4.2
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 05094d655b9dc..f476b3c8a8e6f 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -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 '' |