Skip to content

hyprlandPlugins.hy3: fix build#315924

Merged
wineee merged 1 commit intoNixOS:masterfrom
wineee:hy3-fix
May 31, 2024
Merged

hyprlandPlugins.hy3: fix build#315924
wineee merged 1 commit intoNixOS:masterfrom
wineee:hy3-fix

Conversation

@wineee
Copy link
Member

@wineee wineee commented May 30, 2024

Description of changes

Since #313498 and #314522 hy3 fails to compile #313964 (comment)

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.

@ofborg ofborg bot requested a review from aacebedo May 30, 2024 16:44
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels May 30, 2024
@Mange
Copy link
Contributor

Mange commented May 31, 2024

This derivation works for me! 👍

(Note: I use overrideDerivation to remove the patches, not this PR. However, it's the same outcome so I think it counts.)

@wineee wineee merged commit f322683 into NixOS:master May 31, 2024
@wineee wineee deleted the hy3-fix branch May 31, 2024 06:34
@github-actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-315924-to-release-24.05 origin/release-24.05
cd .worktree/backport-315924-to-release-24.05
git switch --create backport-315924-to-release-24.05
git cherry-pick -x d3197804cd08b7a3bd9eee170272b0336cd111eb

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

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants