Skip to content

aquamarine: fix build#335788

Merged
JohnRTitor merged 1 commit intoNixOS:stagingfrom
flokli:aquamarine-fix-build
Aug 19, 2024
Merged

aquamarine: fix build#335788
JohnRTitor merged 1 commit intoNixOS:stagingfrom
flokli:aquamarine-fix-build

Conversation

@flokli
Copy link
Member

@flokli flokli commented Aug 19, 2024

This tries to load wayland.xml from wayland-client.pc, but it's installed alongside wayland-scanner.

Fix sent upstream in hyprwm/aquamarine#55

Build regression reported in #214906 (comment).

Description of changes

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.

cc @trofi

@flokli flokli requested review from JohnRTitor and alyssais August 19, 2024 11:27
@flokli flokli mentioned this pull request Aug 19, 2024
13 tasks
@JohnRTitor JohnRTitor requested a review from fufexan August 19, 2024 11:39
@flokli flokli force-pushed the aquamarine-fix-build branch from 2c5e833 to 55e092d Compare August 19, 2024 12:05
This tries to load wayland.xml from wayland-client.pc, but it's
installed alongside wayland-scanner.
@flokli flokli force-pushed the aquamarine-fix-build branch from 55e092d to 6b25e18 Compare August 19, 2024 12:08
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Aug 19, 2024
Copy link
Contributor

@fufexan fufexan left a comment

Choose a reason for hiding this comment

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

LGTM

@JohnRTitor JohnRTitor merged commit 18d0ec7 into NixOS:staging Aug 19, 2024
@alyssais
Copy link
Member

Given this is staging, it might have been nice to give upstream a chance to respond so we didn't have to commit the patch, but I guess it's a small one…

@flokli flokli deleted the aquamarine-fix-build branch August 19, 2024 16:19
@trofi
Copy link
Contributor

trofi commented Aug 19, 2024

Thanks all!

@trofi
Copy link
Contributor

trofi commented Aug 23, 2024

Looks like upstream patch already trickled down into release and nixpkgs causing patch conflict in staging. Proposed a simple fix as:

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

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants