Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mumble: fix hang on reconfiguring audio #48774

Merged
merged 1 commit into from Oct 21, 2018
Merged

mumble: fix hang on reconfiguring audio #48774

merged 1 commit into from Oct 21, 2018

Conversation

thefloweringash
Copy link
Member

Motivation for this change

#48004

Pulls in a proposed change to upstream (mumble-voip/mumble#3418). Unfortunately it's not yet merged, and the PR has been inactive for a few months. However, it's a very small change, and makes mumble usable again.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@timokau
Copy link
Member

timokau commented Oct 21, 2018

@GrahamcOfBorg build mumble

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: mumble

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@timokau timokau mentioned this pull request Oct 21, 2018
Merged
timokau
timokau approved these changes Oct 21, 2018
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for fixing that issue! Hopefully upstream will include that fix in the next release.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: mumble

Partial log (click to expand)

shrinking /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19/lib/libcelt0.so.0.11.0
shrinking /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19/lib/liblink.so
shrinking /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19/lib/libmanual.so
shrinking /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19/lib/libmumble.so.1.2.19
gzipping man pages under /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19/lib  /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19/bin
patching script interpreter paths in /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19
checking for references to /build in /nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19...
/nix/store/7pmzaycw1i1x670a0gcmmz208076pn4l-mumble-1.2.19

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: mumble

Partial log (click to expand)

shrinking /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19/lib/libcelt0.so.0.11.0
shrinking /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19/lib/libmumble.so.1.2.19
shrinking /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19/lib/liblink.so
shrinking /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19/bin/mumble
gzipping man pages under /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19/lib  /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19/bin
patching script interpreter paths in /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19
checking for references to /build in /nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19...
/nix/store/3l6xbvahb8m7yxz3w770z8mdxjlx6l2j-mumble-1.2.19

@timokau timokau merged commit 994826f into NixOS:master Oct 21, 2018
timokau
timokau reviewed Oct 21, 2018
View reviewed changes
pkgs/applications/networking/mumble/default.nix
# Fix compile error against boost 1.66 (#33655):
(fetchpatch {
url = "https://github.com/mumble-voip/mumble/commit/"
+ "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just as an aside, I don't really see any use in splitting the url like that. It only makes copying it harder.

@thefloweringash thefloweringash deleted the mumble-hang branch November 4, 2018 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thefloweringash @timokau @GrahamcOfBorg