Unverified Commit 39e6bf76 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #121623 from wlib/audacity-3.0.2

audacity: 2.4.2 -> 3.0.2
parents 1b1d7e93 49cfef8c
Loading
Loading
Loading
Loading
+31 −8
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
, ffmpeg
, soundtouch
, pcre /*, portaudio - given up fighting their portaudio.patch */
, linuxHeaders
, at-spi2-core ? null
, dbus ? null
, epoxy ? null
@@ -41,24 +42,35 @@
}:

# TODO
# - as of 2.4.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions
# - as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions
# - detach sbsms

let
  wxGTK-audacity = wxGTK.overrideAttrs (oldAttrs: rec {
    src = fetchFromGitHub {
      owner = "audacity";
      repo = "wxWidgets";
      rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985";
      sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a";
      fetchSubmodules = true;
    };
  });
in
stdenv.mkDerivation rec {
  pname = "audacity";
  version = "2.4.2";
  version = "3.0.2";

  src = fetchFromGitHub {
    owner = "audacity";
    repo = "audacity";
    rev = "Audacity-${version}";
    sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI=";
    sha256 = "035qq2ff16cdl2cb9iply2bfjmhfl1dpscg79x6c9l0i9m8k41zj";
  };

  patches = [
    (fetchpatch {
      url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch";
      sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc=";
      url = "https://github.com/audacity/audacity/commit/007852e51fcbb5f1f359d112f28b8984a604dac6.patch";
      sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw";
      name = "audacity_xdg_paths.patch";
    })
  ];
@@ -68,6 +80,10 @@ stdenv.mkDerivation rec {
    touch src/RevisionIdent.h
  '';

  preConfigure = ''
    substituteInPlace src/FileNames.cpp --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
  '';

  # workaround for a broken cmake. Drop it with a later version to see if it works.
  # https://github.com/NixOS/nixpkgs/issues/94905
  cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES=";
@@ -86,7 +102,14 @@ stdenv.mkDerivation rec {
    "-lswscale"
  ];

  nativeBuildInputs = [ cmake gettext pkg-config python3 ];
  nativeBuildInputs = [
    cmake
    gettext
    pkg-config
    python3
  ] ++ lib.optionals stdenv.isLinux [
    linuxHeaders
  ];

  buildInputs = [
    alsaLib
@@ -110,8 +133,8 @@ stdenv.mkDerivation rec {
    sratom
    suil
    twolame
    wxGTK
    wxGTK.gtk
    wxGTK-audacity
    wxGTK-audacity.gtk
  ] ++ lib.optionals stdenv.isLinux [
    at-spi2-core
    dbus
+1 −3
Original line number Diff line number Diff line
@@ -22160,9 +22160,7 @@ in
  audacious = libsForQt5.callPackage ../applications/audio/audacious { };
  audaciousQt5 = audacious;
  audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };
  audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; };
  audacity = audacity-gtk2;
  audacity = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };
  audio-recorder = callPackage ../applications/audio/audio-recorder { };