diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2018-10-21 21:21:34 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2018-10-21 21:48:11 +0900 |
| commit | 773c8807c99f3ae171d78eca2de26abe5dfaf944 (patch) | |
| tree | 954990b8bb71ff9f61eb233a64909c4c78c0158f /pkgs/applications/networking/mumble/default.nix | |
| parent | 4bb06d7be7050bd25ac7d551c9b011dffd0bb328 (diff) | |
mumble: fix hang on reconfiguring audio
Diffstat (limited to 'pkgs/applications/networking/mumble/default.nix')
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index cda02fedfb69c..d0a690496e27b 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -118,12 +118,21 @@ let sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh"; }; - # Fix compile error against boost 1.66 (#33655): - patches = singleton (fetchpatch { - url = "https://github.com/mumble-voip/mumble/commit/" - + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch"; - sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh"; - }); + patches = [ + # Fix compile error against boost 1.66 (#33655): + (fetchpatch { + url = "https://github.com/mumble-voip/mumble/commit/" + + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch"; + sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh"; + }) + # Fixes hang on reconfiguring audio (often including startup) + # https://github.com/mumble-voip/mumble/pull/3418 + (fetchpatch { + url = "https://github.com/mumble-voip/mumble/commit/" + + "fbbdf2e8ab7d93ed6f7680268ad0689b7eaa71ad.patch"; + sha256 = "1yhj62mlwm6q42i4aclbia645ha97d3j4ycxhgafr46dbjs0gani"; + }) + ]; }; gitSource = rec { |