diff options
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 80db3020ba5f5..bf03fe3267d24 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -4,10 +4,13 @@ , jack2 ? null , speechdSupport ? false , speechd ? null +, pulseSupport ? false +, pulseaudio ? null }: assert jackSupport -> jack2 != null; assert speechdSupport -> speechd != null; +assert pulseSupport -> pulseaudio != null; let optional = stdenv.lib.optional; @@ -37,7 +40,8 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 boost protobuf libsndfile speex libopus avahi pkgconfig ] ++ (optional jackSupport jack2) - ++ (optional speechdSupport speechd); + ++ (optional speechdSupport speechd) + ++ (optional pulseSupport pulseaudio); installPhase = '' mkdir -p $out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 908d64be5de78..bafa89a87a242 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10507,6 +10507,7 @@ let }; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; + pulseSupport = config.pulseaudio or false; }; murmur = callPackage ../applications/networking/mumble/murmur.nix { |