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

Merge pull request #5698 from abbradar/mumble-pa

Browse Source 
mumble: add pulseaudio support
This commit is contained in:
Arseniy Seroka 2015-01-10 23:49:21 +03:00
commit 0a80cf9e51
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/mumble/default.nix
View File

@ -4,10 +4,13 @@
, jack2 ? null , jack2 ? null
, speechdSupport ? false , speechdSupport ? false
, speechd ? null , speechd ? null
, pulseSupport ? false
, pulseaudio ? null
}: }:
assert jackSupport -> jack2 != null; assert jackSupport -> jack2 != null;
assert speechdSupport -> speechd != null; assert speechdSupport -> speechd != null;
assert pulseSupport -> pulseaudio != null;
let let
optional = stdenv.lib.optional; optional = stdenv.lib.optional;
@ -37,7 +40,8 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 boost protobuf libsndfile speex buildInputs = [ qt4 boost protobuf libsndfile speex
libopus avahi pkgconfig ] libopus avahi pkgconfig ]
++ (optional jackSupport jack2) ++ (optional jackSupport jack2)
++ (optional speechdSupport speechd); ++ (optional speechdSupport speechd)
++ (optional pulseSupport pulseaudio);
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

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

@ -10507,6 +10507,7 @@ let
}; };
jackSupport = config.mumble.jackSupport or false; jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false; speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
}; };
murmur = callPackage ../applications/networking/mumble/murmur.nix { murmur = callPackage ../applications/networking/mumble/murmur.nix {