public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75358 from petabyteboy/feature/mumble

Browse Source 
mumble: build with pulseaudio support on linux and add petabyteboy to maintainers
This commit is contained in:
Renaud 2019-12-14 18:39:44 +01:00 committed by GitHub
commit fc199f5277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/mumble/default.nix
View File

@ -16,7 +16,8 @@ assert iceSupport -> zeroc-ice != null;
with stdenv.lib; with stdenv.lib;
let let
generic = overrides: source: qt5.mkDerivation (source // overrides // { 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; patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
@ -63,9 +64,9 @@ let
meta = { meta = {
description = "Low-latency, high quality voice chat software"; description = "Low-latency, high quality voice chat software";
homepage = https://mumble.info; homepage = "https://mumble.info";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ petabyteboy ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}); });

2
pkgs/top-level/all-packages.nix
View File

@ -20163,7 +20163,7 @@ in
avahi = avahi-compat; avahi = avahi-compat;
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 false; pulseSupport = config.pulseaudio or stdenv.isLinux;
}).mumble; }).mumble;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {