Skip to content

Revert "wayland: don't propagate bin output"#329523

Merged
flokli merged 1 commit intoNixOS:stagingfrom
flokli:revert-wayland-propagate-bin
Jul 25, 2024
Merged

Revert "wayland: don't propagate bin output"#329523
flokli merged 1 commit intoNixOS:stagingfrom
flokli:revert-wayland-propagate-bin

Conversation

@flokli
Copy link
Member

@flokli flokli commented Jul 23, 2024

This reverts commit 3f15de5.

As commented in
#328804 (comment), this broke quite some builds, and some of the interactions between wayland and its .pc file are still uncertain. Revert for now, and re-roll this later.

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.

This reverts commit 3f15de5.

As commented in
NixOS#328804 (comment),
this broke quite some builds, and some of the interactions between
wayland and its `.pc` file are still uncertain. Revert for now, and
re-roll this later.
@flokli flokli requested a review from SomeoneSerge July 23, 2024 22:09
@ofborg ofborg bot requested review from alyssais, codyopel and primeos July 24, 2024 00:18
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 24, 2024
Copy link
Member

@wineee wineee left a comment

Choose a reason for hiding this comment

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

@flokli flokli merged commit 3d86ffb into NixOS:staging Jul 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants