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

mumble: use different zeroc-ice versions

Browse Source 
Needed to unbreak ICE support in murmur RC version.
This commit is contained in:
Nikolay Amiantov 2019-09-06 19:09:28 +03:00
parent b667dd981d
commit 094a399fca
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,13 +4,13 @@
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null , speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
, iceSupport ? false, zeroc_ice ? null , iceSupport ? false, zeroc-ice ? null, zeroc-ice-36 ? null
}: }:
assert jackSupport -> libjack2 != null; assert jackSupport -> libjack2 != null;
assert speechdSupport -> speechd != null; assert speechdSupport -> speechd != null;
assert pulseSupport -> libpulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert iceSupport -> zeroc_ice != null; assert iceSupport -> zeroc-ice != null && zeroc-ice-36 != null;
with stdenv.lib; with stdenv.lib;
let let
@ -41,7 +41,6 @@ let
"CONFIG+=no-bundled-speex" "CONFIG+=no-bundled-speex"
] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
++ optional (!iceSupport) "CONFIG+=no-ice"
++ (overrides.configureFlags or [ ]); ++ (overrides.configureFlags or [ ]);
preConfigure = '' preConfigure = ''
@ -108,24 +107,24 @@ let
''; '';
} source; } source;
server = generic { server = source: let ice = if source.qtVersion == 4 then zeroc-ice-36 else zeroc-ice; in generic {
type = "murmur"; type = "murmur";
postPatch = optional iceSupport '' postPatch = optional iceSupport ''
grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${ice.dev}/share/ice/,g'
''; '';
configureFlags = [ configureFlags = [
"CONFIG+=no-client" "CONFIG+=no-client"
]; ] ++ optional (!iceSupport) "CONFIG+=no-ice";
buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice; buildInputs = [ libcap ] ++ optional iceSupport ice;
installPhase = '' installPhase = ''
# bin stuff # bin stuff
install -Dm755 release/murmurd $out/bin/murmurd install -Dm755 release/murmurd $out/bin/murmurd
''; '';
}; } source;
stableSource = rec { stableSource = rec {
version = "1.2.19"; version = "1.2.19";
@ -170,7 +169,5 @@ in {
mumble = client stableSource; mumble = client stableSource;
mumble_rc = client rcSource; mumble_rc = client rcSource;
murmur = server stableSource; murmur = server stableSource;
murmur_rc = (server rcSource).overrideAttrs (old: { murmur_rc = server rcSource;
meta = old.meta // { broken = iceSupport; };
});
} }

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

@ -19573,15 +19573,7 @@ in
speechdSupport = config.mumble.speechdSupport or false; speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false; pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true; iceSupport = config.murmur.iceSupport or true;
}) mumble mumble_rc murmur; }) mumble mumble_rc murmur murmur_rc;
inherit (callPackages ../applications/networking/mumble {
avahi = avahi-compat;
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
iceSupport = false;
}) murmur_rc;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux" mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux"