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

pulseaudio: fix on Darwin

Browse Source
This commit is contained in:
Matthew Bauer 2017-01-04 13:21:48 -06:00
parent 0ede72738d
commit 5c09b223f9
No known key found for this signature in database
GPG Key ID: E04D0AD9469141C3
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/pulseaudio/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook { lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook
, json_c, libsndfile, libtool , json_c, libsndfile, libtool
, xorg, libcap, alsaLib, glib , xorg, libcap, alsaLib, glib
, avahi, libjack2, libasyncns, lirc, dbus , avahi, libjack2, libasyncns, lirc, dbus
@ -30,6 +30,8 @@
, # Whether to build only the library. , # Whether to build only the library.
libOnly ? false libOnly ? false
, CoreServices, AudioUnit, Cocoa
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -41,7 +43,11 @@ stdenv.mkDerivation rec {
sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3"; 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" ]; outputs = [ "out" "dev" ];
@ -53,6 +59,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ json_c libsndfile speexdsp fftwFloat ] [ json_c libsndfile speexdsp fftwFloat ]
++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isLinux [ glib dbus ]
++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ]
++ lib.optionals (!libOnly) ( ++ lib.optionals (!libOnly) (
[ libasyncns webrtc-audio-processing ] [ libasyncns webrtc-audio-processing ]
++ lib.optional jackaudioSupport libjack2 ++ lib.optional jackaudioSupport libjack2

10
pkgs/top-level/all-packages.nix
View File

@ -10315,11 +10315,16 @@ in
pshs = callPackage ../servers/http/pshs { }; 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; # Name is changed to prevent use in packages;
# please use libpulseaudio instead. # please use libpulseaudio instead.
pulseaudioLight = callPackage ../servers/pulseaudio { }; pulseaudioLight = callPackage ../servers/pulseaudio {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
};
pulseaudioFull = callPackage ../servers/pulseaudio { pulseaudioFull = callPackage ../servers/pulseaudio {
gconf = gnome3.gconf; gconf = gnome3.gconf;
@ -10330,6 +10335,7 @@ in
bluetoothSupport = true; bluetoothSupport = true;
remoteControlSupport = true; remoteControlSupport = true;
zeroconfSupport = true; zeroconfSupport = true;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
}; };
tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };