diff options
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d93e5fbb9637c..bde8f7c4fedb3 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib, python +, alsaLib, python3 , rnnoise , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null @@ -25,7 +25,7 @@ let patches = (source.patches or []) ++ [ ./fix-rnnoise-argument.patch ]; - nativeBuildInputs = [ pkg-config python qt5.qmake ] + nativeBuildInputs = [ pkg-config python3 qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 156d0c8afd99b..c22d39771c5db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23559,7 +23559,6 @@ in jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or stdenv.isLinux; - qt5 = qt514; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { |