Skip to content

libpulseaudio: fix aarch64-darwin build #152371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobby285271 merged 1 commit into from
Jan 2, 2022
Merged

libpulseaudio: fix aarch64-darwin build #152371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkgs/servers/pulseaudio/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
, # Whether to build only the library.
libOnly ? false

, AudioUnit, Cocoa, CoreServices, Libc
, AudioUnit, Cocoa, CoreServices
}:

stdenv.mkDerivation rec {
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down