diff options
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 26dcbe200792c..fff0bc5edc469 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2ee65deae114..8aa04dcca143a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14343,7 +14343,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; |