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

syncthingtray: fix darwin build #295271

Merged
merged 1 commit into from
Mar 12, 2024
Merged

syncthingtray: fix darwin build #295271

merged 1 commit into from
Mar 12, 2024

Conversation

davidkna
Copy link
Contributor

Description of changes

qtwayland is a Linux-only dependency that doesn't build on darwin, thus gate it with stdenv.isLInux. Introduced in #294935.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

Built the package with the changes and tested basic functionality of the binaries.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Mar 12, 2024
@davidkna davidkna changed the base branch from nixpkgs-unstable to master March 12, 2024 10:22
qtwayland is a Linux-only dependency
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 12, 2024
@ofborg ofborg bot requested a review from doronbehar March 12, 2024 10:53
@doronbehar doronbehar merged commit 6ec6896 into NixOS:master Mar 12, 2024
24 of 26 checks passed
@davidkna davidkna deleted the patch-4 branch March 12, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants