From 5c09b223f9aca13a793935142f29cf98151ee360 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 4 Jan 2017 13:21:48 -0600 Subject: [PATCH] pulseaudio: fix on Darwin --- pkgs/servers/pulseaudio/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 10 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index efa5d71a76f..09be8c7c587 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac48186d58f..76f52481fb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10315,11 +10315,16 @@ in pshs = callPackage ../servers/http/pshs { }; - libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; + libpulseaudio = callPackage ../servers/pulseaudio { + libOnly = true; + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; + }; # Name is changed to prevent use in packages; # please use libpulseaudio instead. - pulseaudioLight = callPackage ../servers/pulseaudio { }; + pulseaudioLight = callPackage ../servers/pulseaudio { + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; + }; pulseaudioFull = callPackage ../servers/pulseaudio { gconf = gnome3.gconf; @@ -10330,6 +10335,7 @@ in bluetoothSupport = true; remoteControlSupport = true; zeroconfSupport = true; + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };