Merge pull request #153220 from mikroskeem/darwin-fix-libpulseaudio-aarch64

libpulseaudio: fix aarch64-darwin build
This commit is contained in:
Bobby Rong
2022-01-03 10:36:35 +08:00
committed by GitHub
2 changed files with 2 additions and 5 deletions
+2 -4
View File
@@ -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"
-1
View File
@@ -21352,7 +21352,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,