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.

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

doomseeker: fix build by using qt wrapper hook #79794

Merged
merged 2 commits into from Feb 17, 2020
Merged

doomseeker: fix build by using qt wrapper hook #79794

merged 2 commits into from Feb 17, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Feb 11, 2020

Current master immediately crashes; this fixes the build and the program runs
successfully. See #65399 for details.

Closed #79128

Motivation for this change
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.

@ofborg ofborg bot requested a review from MP2E February 11, 2020 04:48
@veprbl
Copy link
Member

veprbl commented Feb 11, 2020

@GrahamcOfBorg build doomseeker

@worldofpeace
Copy link
Contributor

This should be backported to both 19.09 and 20.03 please.

@bhipple
doomseeker: fix build by using qt wrapper hook
86ae622 
Current master immediately crashes; this fixes the build and the program runs
successfully. See NixOS#65399 for details.

Closed NixOS#79128
@bhipple
Copy link
Contributor Author

bhipple commented Feb 12, 2020

@GrahamcOfBorg build doomseeker

@veprbl
doomseeker: cleanup
4f868f6 
This avoids using NIX_CFLAGS_COMPILE by switching to hardeningDisable.
The hack is also only needed for darwin sources and is not specific to
clang. This also removes non-standard isClang argument.
@veprbl
Copy link
Member

veprbl commented Feb 17, 2020

@GrahamcOfBorg build doomseeker

veprbl
veprbl approved these changes Feb 17, 2020
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

Tested to run on NixOS, tested to build with the clangStdenv on NixOS.

@veprbl veprbl merged commit 5ef4af7 into NixOS:master Feb 17, 2020
veprbl pushed a commit that referenced this pull request Feb 17, 2020
@bhipple @veprbl
doomseeker: add qt wrapper, cleanup (#79794)
bf36ec6 
This avoids using NIX_CFLAGS_COMPILE by switching to hardeningDisable.
The hack is also only needed for darwin sources and is not specific to
clang.

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>

(cherry picked from commit 5ef4af7)
cc #79794
veprbl pushed a commit that referenced this pull request Feb 17, 2020
@bhipple @veprbl
doomseeker: add qt wrapper, cleanup (#79794)
bee35e7 
This avoids using NIX_CFLAGS_COMPILE by switching to hardeningDisable.
The hack is also only needed for darwin sources and is not specific to
clang.

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>

(cherry picked from commit 5ef4af7)
cc #79794
@veprbl veprbl added the 8.has: port to stable A PR already has a backport to the stable release. label Feb 17, 2020
@worldofpeace
Copy link
Contributor

Thanks for backports @veprbl ✨

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace left review comments

@veprbl veprbl veprbl approved these changes

@MP2E MP2E Awaiting requested review from MP2E

Assignees
No one assigned
Labels
8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Package doomseeker does not work
3 participants
@bhipple @veprbl @worldofpeace