From f5a98fef5ff4a446d143101f85c5752b6dfc7c70 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 24 Dec 2022 20:26:55 +0100 Subject: [PATCH] snapcast: unbreak on x86_64-darwin --- pkgs/applications/audio/snapcast/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 513c2bb5695..558948ab4a0 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, darwin +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio , nixosTests }: @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.AudioToolbox]; + ++ lib.optionals stdenv.isDarwin [ IOKit AudioToolbox ]; TARGET=lib.optionalString stdenv.isDarwin "MACOS"; @@ -45,7 +46,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl3Plus; - # never built on x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1593b7e74a..730c2373c6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11713,7 +11713,8 @@ with pkgs; snallygaster = callPackage ../tools/security/snallygaster { }; - snapcast = callPackage ../applications/audio/snapcast { + snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast { + inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; };