cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
libpulseaudio: fix aarch64-darwin build
This commit is contained in:
Bobby Rong 2022-01-02 16:17:29 +08:00 committed by GitHub
commit f4ace5ec6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/pulseaudio/default.nix
View file

@ -26,7 +26,7 @@
, # Whether to build only the library. , # Whether to build only the library.
libOnly ? false libOnly ? false
, AudioUnit, Cocoa, CoreServices, Libc , AudioUnit, Cocoa, CoreServices
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ libtool libsndfile soxr speexdsp fftwFloat ] [ libtool libsndfile soxr speexdsp fftwFloat ]
++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isLinux [ glib dbus ]
++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices Libc ] ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices ]
++ lib.optionals (!libOnly) ( ++ lib.optionals (!libOnly) (
[ libasyncns webrtc-audio-processing ] [ libasyncns webrtc-audio-processing ]
++ lib.optional jackaudioSupport libjack2 ++ lib.optional jackaudioSupport libjack2
@ -101,8 +101,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${Libc}";
installFlags = installFlags =
[ "sysconfdir=${placeholder "out"}/etc" [ "sysconfdir=${placeholder "out"}/etc"
"pulseconfdir=${placeholder "out"}/etc/pulse" "pulseconfdir=${placeholder "out"}/etc/pulse"

1
pkgs/top-level/all-packages.nix
View file

@ -21342,7 +21342,6 @@ with pkgs;
}; };
pulseaudio = callPackage ../servers/pulseaudio ({ pulseaudio = callPackage ../servers/pulseaudio ({
inherit (darwin) Libc;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
} // lib.optionalAttrs stdenv.isDarwin { } // lib.optionalAttrs stdenv.isDarwin {
# Default autoreconfHook (2.70) fails on darwin, # Default autoreconfHook (2.70) fails on darwin,