Revert "libpulseaudio: fix aarch64-darwin build"
This commit is contained in:
parent
f4ace5ec6a
commit
f869423933
|
@ -26,7 +26,7 @@
|
|||
, # Whether to build only the library.
|
||||
libOnly ? false
|
||||
|
||||
, AudioUnit, Cocoa, CoreServices
|
||||
, AudioUnit, Cocoa, CoreServices, Libc
|
||||
}:
|
||||
|
||||
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 ]
|
||||
++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices Libc ]
|
||||
++ lib.optionals (!libOnly) (
|
||||
[ libasyncns webrtc-audio-processing ]
|
||||
++ lib.optional jackaudioSupport libjack2
|
||||
|
@ -101,6 +101,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${Libc}";
|
||||
|
||||
installFlags =
|
||||
[ "sysconfdir=${placeholder "out"}/etc"
|
||||
"pulseconfdir=${placeholder "out"}/etc/pulse"
|
||||
|
|
|
@ -21342,6 +21342,7 @@ 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,
|
||||
|
|
Loading…
Reference in a new issue