diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-18 21:41:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-18 21:41:11 +0100 |
commit | 2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30 (patch) | |
tree | 1e05b953edea63c5acddda00e92a924f66a16b9a /pkgs/servers | |
parent | f4f4200d9ad497efaf4366cfb95112aee20cc32e (diff) | |
parent | 2614fa1de05e0dfad6ab717c9b08c55cdd6389ab (diff) | |
download | nixlib-2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30.tar nixlib-2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30.tar.gz nixlib-2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30.tar.bz2 nixlib-2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30.tar.lz nixlib-2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30.tar.xz nixlib-2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30.tar.zst nixlib-2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30.zip |
Merge pull request #21681 from matthewbauer/anki
Anki: Darwin support
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index efa5d71a76f1..09be8c7c587b 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook , json_c, libsndfile, libtool , xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus @@ -30,6 +30,8 @@ , # Whether to build only the library. libOnly ? false + +, CoreServices, AudioUnit, Cocoa }: stdenv.mkDerivation rec { @@ -41,7 +43,11 @@ stdenv.mkDerivation rec { sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3"; }; - patches = [ ./caps-fix.patch ]; + patches = [ ./caps-fix.patch ] + ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = "https://bugs.freedesktop.org/attachment.cgi?id=127889"; + sha256 = "063h5vmh4ykgxjbxyxjlj6qhyyxhazbh3p18p1ik69kq24nkny9m"; + }); outputs = [ "out" "dev" ]; @@ -53,6 +59,7 @@ stdenv.mkDerivation rec { buildInputs = [ json_c libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] + ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 |