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

flameshot: fix build on Darwin #336647

Merged
merged 3 commits into from
Sep 2, 2024
Merged

Conversation

smancill
Copy link
Contributor

@smancill smancill commented Aug 22, 2024

Description of changes

Fix build on Darwin.

Closes #334739.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Copy link
Contributor

@eclairevoyant eclairevoyant left a 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)

@smancill
Copy link
Contributor Author

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 😕

@eclairevoyant
Copy link
Contributor

eclairevoyant commented Aug 31, 2024

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
@smancill smancill force-pushed the flameshot-fix-darwin branch from 215e51a to 0174d4a Compare August 31, 2024 02:32
@smancill
Copy link
Contributor Author

Got it. It should be OK now.

Copy link
Contributor

@UnsolvedCypher UnsolvedCypher left a 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!

@Artturin Artturin merged commit 81bcc8a into NixOS:master Sep 2, 2024
25 of 26 checks passed
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.

Build failure: flameshot on Darwin
4 participants