tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
murmur_git: mark as not broken without iceSupport
Michael Raskin
8 years ago
3d1f825d
4f742133
+13
-2
2 changed files
expand all
collapse all
unified
split
pkgs
applications
networking
mumble
default.nix
top-level
all-packages.nix
+1
-1
pkgs/applications/networking/mumble/default.nix
···
138
138
mumble_git = client gitSource;
139
139
murmur = server stableSource;
140
140
murmur_git = (server gitSource).overrideAttrs (old: {
141
141
-
meta = old.meta // { broken = true; };
141
141
+
meta = old.meta // { broken = iceSupport; };
142
142
});
143
143
}
+12
-1
pkgs/top-level/all-packages.nix
···
14828
14828
speechdSupport = config.mumble.speechdSupport or false;
14829
14829
pulseSupport = config.pulseaudio or false;
14830
14830
iceSupport = config.murmur.iceSupport or true;
14831
14831
-
}) mumble mumble_git murmur murmur_git;
14831
14831
+
}) mumble mumble_git murmur;
14832
14832
+
14833
14833
+
inherit (callPackages ../applications/networking/mumble {
14834
14834
+
avahi = avahi.override {
14835
14835
+
withLibdnssdCompat = true;
14836
14836
+
};
14837
14837
+
qt5 = qt56; # Mumble doesn't work with Qt > 5.5
14838
14838
+
jackSupport = config.mumble.jackSupport or false;
14839
14839
+
speechdSupport = config.mumble.speechdSupport or false;
14840
14840
+
pulseSupport = config.pulseaudio or false;
14841
14841
+
iceSupport = false;
14842
14842
+
}) murmur_git;
14832
14843
14833
14844
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
14834
14845
mumble_i686 = if system == "x86_64-linux"