pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #267963 from wegank/audacity-bump

audacity: 3.4.1 -> 3.4.2

authored by Weijia Wang and committed by GitHub fc696751 01c615fb

+9 -16
unified split
+9 -6
pkgs/applications/audio/audacity/default.nix
··· 30 30 , libid3tag 31 31 , libopus 32 32 , libuuid 33 - , ffmpeg_4 33 + , ffmpeg_6 34 34 , soundtouch 35 35 , pcre 36 36 , portaudio # given up fighting their portaudio.patch? ··· 62 62 63 63 stdenv.mkDerivation rec { 64 64 pname = "audacity"; 65 - version = "3.4.1"; 65 + version = "3.4.2"; 66 66 67 67 src = fetchFromGitHub { 68 68 owner = "audacity"; 69 69 repo = "audacity"; 70 70 rev = "Audacity-${version}"; 71 - hash = "sha256-g9VdwVRrZrIKd4VUU12C691aM2ilgTJdW5Ic7sokk4M="; 71 + hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ="; 72 72 }; 73 73 74 74 postPatch = '' ··· 95 95 96 96 buildInputs = [ 97 97 expat 98 - ffmpeg_4 98 + ffmpeg_6 99 99 file 100 100 flac 101 101 gtk3 ··· 171 171 172 172 doCheck = false; # Test fails 173 173 174 + dontWrapGApps = true; 175 + 174 176 # Replace audacity's wrapper, to: 175 177 # - put it in the right place, it shouldn't be in "$out/audacity" 176 178 # - Add the ffmpeg dynamic dependency 177 - postInstall = lib.optionalString stdenv.isLinux '' 179 + postFixup = lib.optionalString stdenv.isLinux '' 178 180 wrapProgram "$out/bin/audacity" \ 179 - --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_4 ]} \ 181 + "''${gappsWrapperArgs[@]}" \ 182 + --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_6 ]} \ 180 183 --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ 181 184 --suffix AUDACITY_PATH : "$out/share/audacity" 182 185 '' + lib.optionalString stdenv.isDarwin ''
-10
pkgs/top-level/all-packages.nix
··· 30478 30478 30479 30479 audacity = callPackage ../applications/audio/audacity { 30480 30480 inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit; 30481 - wxGTK32 = wxGTK32.overrideAttrs { 30482 - patches = [ 30483 - (fetchpatch { # required to run audacity 3.3.3 on wxGTK 3.2.4, see PR #266945 30484 - url = "https://github.com/wxWidgets/wxWidgets/commit/425d9455e8307c1267a79d47d77e3dafeb4d86de.patch"; 30485 - excludes = [ "docs/changes.txt" ]; 30486 - revert = true; 30487 - hash = "sha256-6LOYLDLtVCHxNdHAWv3zhlCsljIpi//RJb9XVLGD5hM="; 30488 - }) 30489 - ]; 30490 - }; 30491 30481 }; 30492 30482 30493 30483 audio-recorder = callPackage ../applications/audio/audio-recorder { };