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

skrooge: Fix build #71303

Merged
merged 1 commit into from Oct 25, 2019
Merged

skrooge: Fix build #71303

merged 1 commit into from Oct 25, 2019

Conversation

Flakebi
Copy link
Member

@Flakebi Flakebi commented Oct 17, 2019

Motivation for this change

Fixes the skrooge build with current qt.

Patch is taken from freebsd: https://github.com/swills/freebsd-ports/blob/5387cf4b3d2e6fb0e1fa5187f0c0439f9c3f047a/finance/skrooge/files/patch-gentoo-kf5-5.61-headers

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 nix-review --run "nix-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.

@aanderse
Copy link
Member

@Flakebi it looks like this patch is maybe from gentoo originally? Can you please track it down and then use fetchpatch instead of copy/paste, if you don't mind?

@Flakebi
Copy link
Member Author

Flakebi commented Oct 18, 2019

Thanks for the hint with fetchpatch @aanderse. Should be better now.

Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

Builds and runs, LGTM 👍

Thanks @Flakebi 🎉

@aanderse aanderse merged commit f1ea0a1 into NixOS:master Oct 25, 2019
@silverhook
Copy link
Contributor

When should this show up in 19.09 / stable?

@aanderse
Copy link
Member

aanderse commented Nov 4, 2019

@silverhook interested in cherry picking the commit into a new PR?

@silverhook
Copy link
Contributor

@aanderse, on a normal day, I’d love to take that opportunity and learn.

But I’m currently over my head in other work, so I feel it would be irresponsible of me to commit to something I haven’t done before.

@aanderse aanderse mentioned this pull request Nov 5, 2019
10 tasks
@aanderse
Copy link
Member

aanderse commented Nov 5, 2019

Understood.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants