diff options
author | Nikolay Amiantov <ab@fmap.me> | 2019-09-06 19:09:28 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2019-09-06 20:21:09 +0300 |
commit | 094a399fca5436a986f63702f454937c8d20f0bb (patch) | |
tree | 95994584e60f2d7aa2446768e7f7b0c965b455ad /pkgs/applications/networking | |
parent | b667dd981db5f57d8cd236d7d65b1182d5b9765c (diff) | |
download | nixlib-094a399fca5436a986f63702f454937c8d20f0bb.tar nixlib-094a399fca5436a986f63702f454937c8d20f0bb.tar.gz nixlib-094a399fca5436a986f63702f454937c8d20f0bb.tar.bz2 nixlib-094a399fca5436a986f63702f454937c8d20f0bb.tar.lz nixlib-094a399fca5436a986f63702f454937c8d20f0bb.tar.xz nixlib-094a399fca5436a986f63702f454937c8d20f0bb.tar.zst nixlib-094a399fca5436a986f63702f454937c8d20f0bb.zip |
mumble: use different zeroc-ice versions
Needed to unbreak ICE support in murmur RC version.
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 9f641061bd86..6439991920d9 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -4,13 +4,13 @@ , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null -, iceSupport ? false, zeroc_ice ? null +, iceSupport ? false, zeroc-ice ? null, zeroc-ice-36 ? null }: assert jackSupport -> libjack2 != null; assert speechdSupport -> speechd != null; assert pulseSupport -> libpulseaudio != null; -assert iceSupport -> zeroc_ice != null; +assert iceSupport -> zeroc-ice != null && zeroc-ice-36 != null; with stdenv.lib; let @@ -41,7 +41,6 @@ let "CONFIG+=no-bundled-speex" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" - ++ optional (!iceSupport) "CONFIG+=no-ice" ++ (overrides.configureFlags or [ ]); preConfigure = '' @@ -108,24 +107,24 @@ let ''; } source; - server = generic { + server = source: let ice = if source.qtVersion == 4 then zeroc-ice-36 else zeroc-ice; in generic { type = "murmur"; 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 = [ "CONFIG+=no-client" - ]; + ] ++ optional (!iceSupport) "CONFIG+=no-ice"; - buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice; + buildInputs = [ libcap ] ++ optional iceSupport ice; installPhase = '' # bin stuff install -Dm755 release/murmurd $out/bin/murmurd ''; - }; + } source; stableSource = rec { version = "1.2.19"; @@ -170,7 +169,5 @@ in { mumble = client stableSource; mumble_rc = client rcSource; murmur = server stableSource; - murmur_rc = (server rcSource).overrideAttrs (old: { - meta = old.meta // { broken = iceSupport; }; - }); + murmur_rc = server rcSource; } |