cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #110746 from TredwellGit/mumble

Browse source 
mumble: replace python and qt514 with python3 and qt5
This commit is contained in:
Silvan Mosberger 2021-01-26 22:05:57 +01:00 committed by GitHub
commit 6d96b2655e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/mumble/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5 { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkg-config, qt5
, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib, python , alsaLib, python3
, rnnoise , rnnoise
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null , speechdSupport ? false, speechd ? null
@ -25,7 +25,7 @@ let
patches = (source.patches or []) patches = (source.patches or [])
++ [ ./fix-rnnoise-argument.patch ]; ++ [ ./fix-rnnoise-argument.patch ];
nativeBuildInputs = [ pkg-config python qt5.qmake ] nativeBuildInputs = [ pkg-config python3 qt5.qmake ]
++ (overrides.nativeBuildInputs or [ ]); ++ (overrides.nativeBuildInputs or [ ]);
buildInputs = [ boost protobuf avahi ] buildInputs = [ boost protobuf avahi ]

1
pkgs/top-level/all-packages.nix
View file

@ -23582,7 +23582,6 @@ in
jackSupport = config.mumble.jackSupport or false; jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false; speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or stdenv.isLinux; pulseSupport = config.pulseaudio or stdenv.isLinux;
qt5 = qt514;
}).mumble; }).mumble;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {