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

murmur_git: mark as not broken without iceSupport

Browse Source
This commit is contained in:
Michael Raskin 2017-05-01 10:44:47 +02:00
parent 4f74213319
commit 3d1f825d2b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,6 +138,6 @@ in {
mumble_git = client gitSource;
murmur = server stableSource;
murmur_git = (server gitSource).overrideAttrs (old: {
meta = old.meta // { broken = true; };
meta = old.meta // { broken = iceSupport; };
});
}

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

@ -14828,7 +14828,18 @@ with pkgs;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true;
}) mumble mumble_git murmur murmur_git;
}) mumble mumble_git murmur;
inherit (callPackages ../applications/networking/mumble {
avahi = avahi.override {
withLibdnssdCompat = true;
};
qt5 = qt56; # Mumble doesn't work with Qt > 5.5
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
iceSupport = false;
}) murmur_git;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
mumble_i686 = if system == "x86_64-linux"