Merge pull request #110746 from TredwellGit/mumble
mumble: replace python and qt514 with python3 and qt5
This commit is contained in:
commit
6d96b2655e
@ -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 ]
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user