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

mapmap: Fix startup issues and unbreak the derivation. #105793

Merged
merged 1 commit into from Dec 5, 2020
Merged

mapmap: Fix startup issues and unbreak the derivation. #105793

merged 1 commit into from Dec 5, 2020

Conversation

baldo
Copy link
Contributor

@baldo baldo commented Dec 3, 2020

Motivation for this change

mapmap has been broken as far as I can see for two reasons:

  1. It segfaulted on startup due to a too early initialization of it's message handler. See: Install message handler after instanciating MainApplication mapmapteam/mapmap#519
  2. It did not use wrapQtAppsHook and therefor failed on startup with the usual error message.

I'm not familiar with mapmap right now, so I so far can only tell that it starts up again.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@baldo baldo changed the title mapmap mapmap: Fix startup issues and unbreak the derivation. Dec 3, 2020
@ofborg ofborg bot requested a review from erictapen December 3, 2020 14:39
@erictapen
Copy link
Member

Thank you very much for fixing mapmap. Additionally to @SuperSandro2000's comment I'd prefer it if you could squash the three commits into one.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 105793 run on x86_64-linux 1

1 package built:
  • mapmap

@baldo
Copy link
Contributor Author

baldo commented Dec 3, 2020

Thank you very much for fixing mapmap. Additionally to @SuperSandro2000's comment I'd prefer it if you could squash the three commits into one.

Done.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 105793 run on x86_64-linux 1

1 package built:
  • mapmap

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 105793 run on x86_64-darwin 1

erictapen
erictapen requested changes Dec 5, 2020
View reviewed changes
pkgs/applications/video/mapmap/default.nix Outdated
patches = [
(fetchpatch {
name = "message-handler-segfault.patch";
url = "https://github.com/mapmapteam/mapmap/pull/519.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 one last request: Could you use https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch here? This way it's obvious which commit is meant to be fetched and we won't have the problem of the PR changing later.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. Done.

@baldo
mapmap: Fix startup issues and unbreak the derivation
94ea153 
* Apply patch from not yet merged upstream pull request to fix segfault
* Add wrapQtAppsHook to make it start again
* Mark as unbroken
@ofborg ofborg bot requested a review from erictapen December 5, 2020 18:54
@erictapen erictapen merged commit 6dc4c00 into NixOS:master Dec 5, 2020
@baldo baldo deleted the mapmap branch December 5, 2020 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erictapen erictapen erictapen approved these changes

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@baldo @erictapen @SuperSandro2000