aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/networking/mumble/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/mumble/default.nix')
-rw-r--r--nixpkgs/pkgs/applications/networking/mumble/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/networking/mumble/default.nix b/nixpkgs/pkgs/applications/networking/mumble/default.nix
index 633d6e63dce..c205f18e366 100644
--- a/nixpkgs/pkgs/applications/networking/mumble/default.nix
+++ b/nixpkgs/pkgs/applications/networking/mumble/default.nix
@@ -6,6 +6,7 @@
, speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null
, iceSupport ? false, zeroc-ice ? null
+, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null
, nixosTests
}:
@@ -13,6 +14,7 @@ assert jackSupport -> libjack2 != null;
assert speechdSupport -> speechd != null;
assert pulseSupport -> libpulseaudio != null;
assert iceSupport -> zeroc-ice != null;
+assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null);
with stdenv.lib;
let
@@ -117,9 +119,12 @@ let
configureFlags = [
"CONFIG+=no-client"
- ] ++ optional (!iceSupport) "CONFIG+=no-ice";
+ ] ++ optional (!iceSupport) "CONFIG+=no-ice"
+ ++ optional grpcSupport "CONFIG+=grpc";
- buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice;
+ buildInputs = [ libcap ]
+ ++ optional iceSupport zeroc-ice
+ ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ];
installPhase = ''
# bin stuff
@@ -128,14 +133,14 @@ let
} source;
source = rec {
- version = "1.3.0";
+ version = "1.3.2";
# Needs submodules
src = fetchFromGitHub {
owner = "mumble-voip";
repo = "mumble";
rev = version;
- sha256 = "0g5ri84gg0x3crhpxlzawf9s9l4hdna6aqw6qbdpx1hjlf5k6g8k";
+ sha256 = "1ljn7h7dr9iyhvq7rdh0prl7hzn9d2hhnxv0ni6dha6f7d9qbfy6";
fetchSubmodules = true;
};
};