Unverified Commit fc696751 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #267963 from wegank/audacity-bump 

audacity: 3.4.1 -> 3.4.2
parents 01c615fb 8f69705d

pkgs/applications/audio/audacity/default.nix

+9 −6
Original line number Diff line number Diff line
@@ -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 ''

pkgs/top-level/all-packages.nix

+0 −10
Original line number Diff line number Diff line
@@ -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 { };