Skip to content

xwayland: cherry-pick for pkg-config generation#311886

Closed
Emantor wants to merge 1 commit intoNixOS:masterfrom
Emantor:topic/xwayland-meson
Closed

xwayland: cherry-pick for pkg-config generation#311886
Emantor wants to merge 1 commit intoNixOS:masterfrom
Emantor:topic/xwayland-meson

Conversation

@Emantor
Copy link
Member

@Emantor Emantor commented May 15, 2024

Description of changes

Xwayland generates a pkg-config file that trips up CMake since it includes a include directive where the include directory does not exist. Cherry-pick a patch from the upstream PR to fix pkg-config generation.

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.

Add a 👍 reaction to pull requests you find important.

Xwayland generates a pkg-config file that trips up CMake since it
includes a include directive where the include directory does not exist.
Cherry-pick a patch from the upstream PR to fix pkg-config generation.
@Emantor Emantor force-pushed the topic/xwayland-meson branch from 2219f55 to b8a0acb Compare May 15, 2024 09:09
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels May 15, 2024
K900 added a commit to K900/nixpkgs that referenced this pull request May 15, 2024
- libsystemd used for starting via sd-notify, is already in the closure via libei
- libdecor used for window decorations on rootful
- eglstream backend is gone

Includes patch from NixOS#311886.
@K900
Copy link
Contributor

K900 commented May 15, 2024

@Emantor I've included this patch in my update PR, otherwise there would be merge conflicts: #311966

@Emantor Emantor closed this May 15, 2024
@Emantor Emantor deleted the topic/xwayland-meson branch May 15, 2024 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants