Skip to content

hyprland: fix build#336512

Merged
flokli merged 1 commit intoNixOS:stagingfrom
flokli:hyprland-build-fix
Aug 22, 2024
Merged

hyprland: fix build#336512
flokli merged 1 commit intoNixOS:stagingfrom
flokli:hyprland-build-fix

Conversation

@flokli
Copy link
Member

@flokli flokli commented Aug 22, 2024

Apply the patch fixing wayland.xml discovery.

Marked as draft, maybe hyprwm/Hyprland#7467 gets merged and we can then just fetchpatch from upstream.

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.

@flokli flokli requested review from alyssais and wozeparrot August 22, 2024 10:15
@flokli flokli mentioned this pull request Aug 22, 2024
Merged
13 tasks
@ofborg ofborg bot requested review from JohnRTitor and fufexan August 22, 2024 10:48
@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 22, 2024
@fufexan
Copy link
Contributor

fufexan commented Aug 22, 2024

Is there a reason for this to go in staging instead of master?

@fufexan
Copy link
Contributor

fufexan commented Aug 22, 2024

Just merged the linked PR. Patch can be now changed to https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff.

@flokli
Copy link
Member Author

flokli commented Aug 22, 2024

Is there a reason for this to go in staging instead of master?

It's only exposed since the split of wayland-scanner to its own derivation, and that didn't hit a staging cycle yet IIRC.

@fufexan
Copy link
Contributor

fufexan commented Aug 22, 2024

Makes sense. In that case there may have been an error in a previous related PR #335930.

@flokli flokli force-pushed the hyprland-build-fix branch from ba71245 to 6932a56 Compare August 22, 2024 11:03
@flokli flokli marked this pull request as ready for review August 22, 2024 11:04
@flokli
Copy link
Member Author

flokli commented Aug 22, 2024

Just merged the linked PR. Patch can be now changed to https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff.

Thanks, updated and undrafted. PTAL.

Makes sense. In that case there may have been an error in a previous related PR #335930.

Hmmh, it probably doesn't matter much, or at least shouldn't cause build failures. We can revisit once the staging-next cycle started.

@flokli
hyprland: fix build
73288a2 
Apply the patch fixing wayland.xml discovery.
@flokli flokli force-pushed the hyprland-build-fix branch from 6932a56 to 73288a2 Compare August 22, 2024 11:31
@ofborg ofborg bot requested a review from fufexan August 22, 2024 11:38
@flokli flokli merged commit 1cee1e2 into NixOS:staging Aug 22, 2024
@flokli flokli deleted the hyprland-build-fix branch August 22, 2024 11:51
@ofborg ofborg bot requested a review from fufexan August 22, 2024 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alyssais alyssais Awaiting requested review from alyssais

@wozeparrot wozeparrot Awaiting requested review from wozeparrot

@JohnRTitor JohnRTitor Awaiting requested review from JohnRTitor

@fufexan fufexan Awaiting requested review from fufexan

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@flokli @fufexan