JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libpulseaudio: fix aarch64-darwin build

Browse Source 
Removes darwin Libc buildInput, which does not appear to be needed on
x86_64, and which does not support aarch64 at all (too old)
This commit is contained in:
Mark Vainomaa 2021-12-27 20:32:48 +02:00
parent 0736e7e3a9
commit e9f4ecd90e
No known key found for this signature in database
GPG Key ID: 1B3F9523B542D315
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

@ -21323,7 +21323,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,