diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-28 16:44:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-28 09:44:47 -0400 |
| commit | 4766c30e4df6a3a32cc79145c9f7ed497cc7ba12 (patch) | |
| tree | af17d6e1e4e523fc07ad3d21876ca448d4a0b8d9 | |
| parent | 107e9dd82a5046810b3b63e43ed6a852e8a2cc28 (diff) | |
| download | nixpkgs-4766c30e4df6a3a32cc79145c9f7ed497cc7ba12.tar nixpkgs-4766c30e4df6a3a32cc79145c9f7ed497cc7ba12.tar.gz nixpkgs-4766c30e4df6a3a32cc79145c9f7ed497cc7ba12.tar.bz2 nixpkgs-4766c30e4df6a3a32cc79145c9f7ed497cc7ba12.tar.lz nixpkgs-4766c30e4df6a3a32cc79145c9f7ed497cc7ba12.tar.xz nixpkgs-4766c30e4df6a3a32cc79145c9f7ed497cc7ba12.tar.zst nixpkgs-4766c30e4df6a3a32cc79145c9f7ed497cc7ba12.zip | |
audacity: fix build on x86_64-darwin (#223386)
| -rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6d8f279dadb..24d610f62d0 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") '' + sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; nativeBuildInputs = [ @@ -93,9 +95,6 @@ stdenv.mkDerivation rec { ffmpeg_4 file flac - ] ++ lib.optionals stdenv.isDarwin [ - AppKit - ] ++ [ gtk3 lame libid3tag @@ -135,6 +134,7 @@ stdenv.mkDerivation rec { libuuid util-linux ] ++ lib.optionals stdenv.isDarwin [ + AppKit CoreAudioKit # for portaudio libpng libjpeg diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf9e382dd6d..2040db59dfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28705,8 +28705,8 @@ with pkgs; }; audaciousQt5 = audacious; - audacity = darwin.apple_sdk_11_0.callPackage ../applications/audio/audacity { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudioKit; + audacity = callPackage ../applications/audio/audacity { + inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit; }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; |