Merge pull request #121623 from wlib/audacity-3.0.2

audacity: 2.4.2 -> 3.0.2

authored by

Maximilian Bosch and committed by
GitHub
39e6bf76 1b1d7e93

+32 -11
+31 -8
pkgs/applications/audio/audacity/default.nix
··· 28 , ffmpeg 29 , soundtouch 30 , pcre /*, portaudio - given up fighting their portaudio.patch */ 31 , at-spi2-core ? null 32 , dbus ? null 33 , epoxy ? null ··· 41 }: 42 43 # TODO 44 - # - 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 45 # - detach sbsms 46 47 stdenv.mkDerivation rec { 48 pname = "audacity"; 49 - version = "2.4.2"; 50 51 src = fetchFromGitHub { 52 owner = "audacity"; 53 repo = "audacity"; 54 rev = "Audacity-${version}"; 55 - sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI="; 56 }; 57 58 patches = [ 59 (fetchpatch { 60 - url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch"; 61 - sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc="; 62 name = "audacity_xdg_paths.patch"; 63 }) 64 ]; ··· 66 # this file *should* be generated by cmake but as of 2.4.2 isn't yet 67 postPatch = '' 68 touch src/RevisionIdent.h 69 ''; 70 71 # workaround for a broken cmake. Drop it with a later version to see if it works. ··· 86 "-lswscale" 87 ]; 88 89 - nativeBuildInputs = [ cmake gettext pkg-config python3 ]; 90 91 buildInputs = [ 92 alsaLib ··· 110 sratom 111 suil 112 twolame 113 - wxGTK 114 - wxGTK.gtk 115 ] ++ lib.optionals stdenv.isLinux [ 116 at-spi2-core 117 dbus
··· 28 , ffmpeg 29 , soundtouch 30 , pcre /*, portaudio - given up fighting their portaudio.patch */ 31 + , linuxHeaders 32 , at-spi2-core ? null 33 , dbus ? null 34 , epoxy ? null ··· 42 }: 43 44 # TODO 45 + # - 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 46 # - detach sbsms 47 48 + let 49 + wxGTK-audacity = wxGTK.overrideAttrs (oldAttrs: rec { 50 + src = fetchFromGitHub { 51 + owner = "audacity"; 52 + repo = "wxWidgets"; 53 + rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985"; 54 + sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a"; 55 + fetchSubmodules = true; 56 + }; 57 + }); 58 + in 59 stdenv.mkDerivation rec { 60 pname = "audacity"; 61 + version = "3.0.2"; 62 63 src = fetchFromGitHub { 64 owner = "audacity"; 65 repo = "audacity"; 66 rev = "Audacity-${version}"; 67 + sha256 = "035qq2ff16cdl2cb9iply2bfjmhfl1dpscg79x6c9l0i9m8k41zj"; 68 }; 69 70 patches = [ 71 (fetchpatch { 72 + url = "https://github.com/audacity/audacity/commit/007852e51fcbb5f1f359d112f28b8984a604dac6.patch"; 73 + sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw"; 74 name = "audacity_xdg_paths.patch"; 75 }) 76 ]; ··· 78 # this file *should* be generated by cmake but as of 2.4.2 isn't yet 79 postPatch = '' 80 touch src/RevisionIdent.h 81 + ''; 82 + 83 + preConfigure = '' 84 + substituteInPlace src/FileNames.cpp --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h 85 ''; 86 87 # workaround for a broken cmake. Drop it with a later version to see if it works. ··· 102 "-lswscale" 103 ]; 104 105 + nativeBuildInputs = [ 106 + cmake 107 + gettext 108 + pkg-config 109 + python3 110 + ] ++ lib.optionals stdenv.isLinux [ 111 + linuxHeaders 112 + ]; 113 114 buildInputs = [ 115 alsaLib ··· 133 sratom 134 suil 135 twolame 136 + wxGTK-audacity 137 + wxGTK-audacity.gtk 138 ] ++ lib.optionals stdenv.isLinux [ 139 at-spi2-core 140 dbus
+1 -3
pkgs/top-level/all-packages.nix
··· 22160 audacious = libsForQt5.callPackage ../applications/audio/audacious { }; 22161 audaciousQt5 = audacious; 22162 22163 - audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; 22164 - audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; 22165 - audacity = audacity-gtk2; 22166 22167 audio-recorder = callPackage ../applications/audio/audio-recorder { }; 22168
··· 22160 audacious = libsForQt5.callPackage ../applications/audio/audacious { }; 22161 audaciousQt5 = audacious; 22162 22163 + audacity = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; 22164 22165 audio-recorder = callPackage ../applications/audio/audio-recorder { }; 22166