diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-08-01 12:35:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 12:35:16 +0100 |
| commit | cc2c11d54395a1a7972bd8c87512ec1610824c43 (patch) | |
| tree | d2003e786b126e2b00b88451a4e15e86f5aecf84 | |
| parent | ab5b6828af26215bf2646c31961da5d3749591ef (diff) | |
| parent | 85a09cf3a3edbdef5cd71856d424b3ce16b5978a (diff) | |
| download | nixpkgs-cc2c11d54395a1a7972bd8c87512ec1610824c43.tar nixpkgs-cc2c11d54395a1a7972bd8c87512ec1610824c43.tar.gz nixpkgs-cc2c11d54395a1a7972bd8c87512ec1610824c43.tar.bz2 nixpkgs-cc2c11d54395a1a7972bd8c87512ec1610824c43.tar.lz nixpkgs-cc2c11d54395a1a7972bd8c87512ec1610824c43.tar.xz nixpkgs-cc2c11d54395a1a7972bd8c87512ec1610824c43.tar.zst nixpkgs-cc2c11d54395a1a7972bd8c87512ec1610824c43.zip | |
Merge pull request #132271 from angustrau/pulseaudio-aarch64-darwin
pulseaudio: fix build on aarch64-darwin
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 10b18dd1ae1..232b228394b 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -92,7 +92,10 @@ stdenv.mkDerivation rec { "--with-bash-completion-dir=${placeholder "out"}/share/bash-completions/completions" ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" - ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" + ++ lib.optionals stdenv.isDarwin [ + "--with-mac-sysroot=/" + "--disable-neon-opt" + ] ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-gsettings"; |