From 7d1abc0fc5a6c07c1b8942f92c377a016be34174 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 5 Nov 2024 11:00:12 +0000 Subject: [PATCH] musescore: apple-sdk migration, removed portaudio override --- pkgs/applications/audio/musescore/default.nix | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 6f28bf98a1b1..100034b998e4 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -31,24 +31,10 @@ , qtnetworkauth , qttools , nixosTests -, darwin +, apple-sdk_11 }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv - # from Qt and the 11.0 SDK frameworks. - portaudio' = if stdenv.hostPlatform.isDarwin then portaudio.override { - stdenv = stdenv'; - inherit (darwin.apple_sdk_11_0.frameworks) - AudioUnit - AudioToolbox - CoreAudio - CoreServices - Carbon - ; - } else portaudio; -in stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "musescore"; version = "4.4.2"; @@ -129,7 +115,7 @@ in stdenv'.mkDerivation (finalAttrs: { libpulseaudio libsndfile libvorbis - portaudio' + portaudio portmidi flac libopusenc @@ -145,7 +131,7 @@ in stdenv'.mkDerivation (finalAttrs: { alsa-lib qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa + apple-sdk_11 ]; postInstall = ''