Merge pull request #18948 from kevincox/mumble-ice

Fix building mumble without ice.
This commit is contained in:
zimbatm 2016-09-26 12:39:10 +01:00 committed by GitHub
commit fb8e541da2
2 changed files with 2 additions and 1 deletions

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 = ''

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;