-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
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
flameshot: fix build on Darwin #336647
flameshot: fix build on Darwin #336647
Conversation
0c63444
to
092dc76
Compare
092dc76
to
215e51a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we keep the reformatting to be its own commit? It makes it easier to review the changes (and the formatting commit can then be excluded via .git-blame-ignore-revs
)
But it is. I don't understand. It's already two commits, one to reformat and the other applying the Darwin fixes 😕 |
There's other changes in the reformat commit, which is why I asked. We can't exclude the commit as-is because it's changing other parts of the expression. |
- Only enable Wayland options on Linux - Disable update checker - Add support to build with the monochrome icon
215e51a
to
0174d4a
Compare
Got it. It should be OK now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, and I can confirm this builds and installs successfully on aarch64-darwin. Thank you for fixing this!
Description of changes
Fix build on Darwin.
Closes #334739.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.