From d7f8e5b19dd85235d765713934dad80a37fc6fb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 02:10:59 +0000 Subject: [PATCH 1/2] audacity: 3.6.4 -> 3.7.0 --- pkgs/by-name/au/audacity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index cbd16b123405..a15d880735d7 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "audacity"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${finalAttrs.version}"; - hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; + hash = "sha256-jwsn/L9e1ViWLOh8Xc4lTS9FhanD4GK0BllCwtPamZc="; }; postPatch = From 8c416bc8b82f6c36f2898690085d780458cc3843 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:03:47 +0100 Subject: [PATCH 2/2] audacity: migrate to apple-sdk_11 --- pkgs/by-name/au/audacity/package.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index a15d880735d7..050ace8c708a 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -52,9 +52,9 @@ wavpack, wxGTK32, gtk3, + apple-sdk_11, libpng, libjpeg, - darwin, }: # TODO @@ -75,18 +75,12 @@ stdenv.mkDerivation (finalAttrs: { '' mkdir src/private substituteInPlace scripts/build/macOS/fix_bundle.py \ - --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" + --replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ - --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' - + - lib.optionalString - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") - '' - sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm - ''; + --replace-fail /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + ''; nativeBuildInputs = [ @@ -150,8 +144,7 @@ stdenv.mkDerivation (finalAttrs: { util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreAudioKit # for portaudio + apple-sdk_11 libpng libjpeg ];