mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues 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
parent 4f596fb93f 663082b366
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
, 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

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

@ -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 {