diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2021-01-26 22:05:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 22:05:57 +0100 |
| commit | 6d96b2655ea884c5a0a9a148671419ca110ace01 (patch) | |
| tree | 27579154c18e85038972a59c8fd5882322769094 /pkgs | |
| parent | c46b679be03303111d3b14d4e65495766c6b01e9 (diff) | |
| parent | dc8bebb906a9ca6b77b227d35c44203fcb4371e8 (diff) | |
Merge pull request #110746 from TredwellGit/mumble
mumble: replace python and qt514 with python3 and qt5
Diffstat (limited to 'pkgs')
| -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 ec3c42788b34..d27ec697a2fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23582,7 +23582,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 { |