Merge branch 'master' into closure-size

2016-02-14 08:33:51 +01:00
parent 34922a3951 6a036d9fca
commit d039c87984
671 changed files with 37363 additions and 16671 deletions
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap
+, CoreAudio, CoreServices, AudioUnit
 , usePulseAudio }:

 stdenv.mkDerivation rec {
@@ -14,7 +15,8 @@ stdenv.mkDerivation rec {
  buildInputs =
    [ pkgconfig ] ++
    lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++
-    lib.optional stdenv.isLinux libcap;
+    lib.optional stdenv.isLinux libcap ++
+    lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];

  meta = {
    longDescription = ''