From 8ffb4ab81848ed535fce9868b7ab4e0a3947424a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 9 Dec 2019 13:18:39 +0100 Subject: [PATCH 1/2] mumble: add petabyteboy to maintainers --- pkgs/applications/networking/mumble/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fe4c9f32b210..dfb49e14133f 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -16,7 +16,8 @@ assert iceSupport -> zeroc-ice != null; with stdenv.lib; let generic = overrides: source: qt5.mkDerivation (source // overrides // { - name = "${overrides.type}-${source.version}"; + pname = overrides.type; + version = source.version; patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; @@ -63,9 +64,9 @@ let meta = { description = "Low-latency, high quality voice chat software"; - homepage = https://mumble.info; + homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.linux; }; }); From be392b7c02ce273fb14206a3dd16034676c6fe69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 9 Dec 2019 13:18:57 +0100 Subject: [PATCH 2/2] mumble: build with pulseaudio support on linux Most users on Linux will want to have pulseaudio support in their mumble installations, and this way they don't have to recompile mumble with pulseaudio support. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ad6d9346b31..b97f43b9ce81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20203,7 +20203,7 @@ in avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or stdenv.isLinux; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {