diff options
author | TredwellGit <tredwell@tutanota.com> | 2021-01-25 08:49:31 +0000 |
---|---|---|
committer | TredwellGit <tredwell@tutanota.com> | 2021-01-25 08:49:31 +0000 |
commit | dc8bebb906a9ca6b77b227d35c44203fcb4371e8 (patch) | |
tree | f59eb5db549e5f247616c5230c85c96f385acef1 | |
parent | 40f27ff2bef9e5ca1f0753c229e7df0d999fc60c (diff) |
mumble: replace python and qt514 with python3 and qt5
-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 d93e5fbb9637..bde8f7c4fedb 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 156d0c8afd99..c22d39771c5d 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 { |