nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 21:03:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building mumble without ice.

Browse Source
This commit is contained in:
Kevin Cox 2016-09-25 10:24:43 +01:00
parent fda18e432e
commit 180366aa14
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ 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 = ''

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

@ -14343,7 +14343,7 @@ in
avahi = avahi.override { avahi = avahi.override {
withLibdnssdCompat = true; withLibdnssdCompat = true;
}; };
qt5 = qt55; # Mumble is not compatible with qt55 yet qt5 = qt55; # Mumble doesn't work with newer Qt versions.
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 false;