public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121623 from wlib/audacity-3.0.2 

audacity: 2.4.2 -> 3.0.2
This commit is contained in:
Maximilian Bosch 2021-05-04 23:07:42 +02:00 committed by GitHub
parent 1b1d7e93dc 49cfef8c69
commit 39e6bf7647
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/applications/audio/audacity/default.nix
View File

@ -28,6 +28,7 @@
, ffmpeg , ffmpeg
, soundtouch , soundtouch
, pcre /*, portaudio - given up fighting their portaudio.patch */ , pcre /*, portaudio - given up fighting their portaudio.patch */
, linuxHeaders
, at-spi2-core ? null , at-spi2-core ? null
, dbus ? null , dbus ? null
, epoxy ? null , epoxy ? null
@ -41,24 +42,35 @@
}: }:
# TODO # 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 # - 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 { stdenv.mkDerivation rec {
pname = "audacity"; pname = "audacity";
version = "2.4.2"; version = "3.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "audacity"; owner = "audacity";
repo = "audacity"; repo = "audacity";
rev = "Audacity-${version}"; rev = "Audacity-${version}";
sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI="; sha256 = "035qq2ff16cdl2cb9iply2bfjmhfl1dpscg79x6c9l0i9m8k41zj";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch"; url = "https://github.com/audacity/audacity/commit/007852e51fcbb5f1f359d112f28b8984a604dac6.patch";
sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc="; sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw";
name = "audacity_xdg_paths.patch"; name = "audacity_xdg_paths.patch";
}) })
]; ];
@ -68,6 +80,10 @@ stdenv.mkDerivation rec {
touch src/RevisionIdent.h 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. # workaround for a broken cmake. Drop it with a later version to see if it works.
# https://github.com/NixOS/nixpkgs/issues/94905 # https://github.com/NixOS/nixpkgs/issues/94905
cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES="; cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES=";
@ -86,7 +102,14 @@ stdenv.mkDerivation rec {
"-lswscale" "-lswscale"
]; ];
nativeBuildInputs = [ cmake gettext pkg-config python3 ]; nativeBuildInputs = [
cmake
gettext
pkg-config
python3
] ++ lib.optionals stdenv.isLinux [
linuxHeaders
];
buildInputs = [ buildInputs = [
alsaLib alsaLib
@ -110,8 +133,8 @@ stdenv.mkDerivation rec {
sratom sratom
suil suil
twolame twolame
wxGTK wxGTK-audacity
wxGTK.gtk wxGTK-audacity.gtk
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
at-spi2-core at-spi2-core
dbus dbus

4
pkgs/top-level/all-packages.nix
View File

@ -22160,9 +22160,7 @@ in
audacious = libsForQt5.callPackage ../applications/audio/audacious { }; audacious = libsForQt5.callPackage ../applications/audio/audacious { };
audaciousQt5 = audacious; audaciousQt5 = audacious;
audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; audacity = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };
audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; };
audacity = audacity-gtk2;
audio-recorder = callPackage ../applications/audio/audio-recorder { }; audio-recorder = callPackage ../applications/audio/audio-recorder { };