mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

Merge pull request #18948 from kevincox/mumble-ice

Browse source 
Fix building mumble without ice.
This commit is contained in:
zimbatm 2016-09-26 12:39:10 +01:00 committed by GitHub
parent 0e91a0bbe7 180366aa14
commit fb8e541da2
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/networking/mumble/default.nix
View file

@ -37,6 +37,7 @@ let
"CONFIG+=no-bundled-speex"
] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
++ optional (!iceSupport) "CONFIG+=no-ice"
++ (overrides.configureFlags or [ ]);
preConfigure = ''

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

@ -14264,7 +14264,7 @@ in
avahi = avahi.override {
withLibdnssdCompat = true;
};
qt5 = qt55; # Mumble is not compatible with qt55 yet
qt5 = qt55; # Mumble doesn't work with newer Qt versions.
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;