From e9f4ecd90e8f067a14ac57eb4d2947248a2cd35f Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 27 Dec 2021 20:32:48 +0200 Subject: [PATCH] libpulseaudio: fix aarch64-darwin build Removes darwin Libc buildInput, which does not appear to be needed on x86_64, and which does not support aarch64 at all (too old) --- pkgs/servers/pulseaudio/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 47d0384720f4..75eb7046fe73 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -26,7 +26,7 @@ , # Whether to build only the library. libOnly ? false -, AudioUnit, Cocoa, CoreServices, Libc +, AudioUnit, Cocoa, CoreServices }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool libsndfile soxr speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices Libc ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 @@ -101,8 +101,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${Libc}"; - installFlags = [ "sysconfdir=${placeholder "out"}/etc" "pulseconfdir=${placeholder "out"}/etc/pulse" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcf00c88b886..e8cfdb373611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21323,7 +21323,6 @@ with pkgs; }; pulseaudio = callPackage ../servers/pulseaudio ({ - inherit (darwin) Libc; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; } // lib.optionalAttrs stdenv.isDarwin { # Default autoreconfHook (2.70) fails on darwin,