Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wayland-scanner: split from wayland #214906

Draft
wants to merge 57 commits into
base: staging
Choose a base branch
from
Draft

wayland-scanner: split from wayland #214906

wants to merge 57 commits into from

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Feb 6, 2023

Description of changes

We've used a wayland-scanner = wayland.bin alias for ages, to make packages clearer and allow them to be independently overridden. Going the whole way into splitting them into separate packages is useful because it means we can have different meta.platforms attributes for libwayland and wayland-scanner.

There is no duplication in outputs between the two packages — they don't install any files in common.

Draft because I'm going to need to test the downstream packages and make sure none were relying on pulling wayland-scanner from the wayland attribute.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@alyssais alyssais mentioned this pull request Feb 6, 2023
Closed
13 tasks
@wegank
Copy link
Member

wegank commented Feb 6, 2023 •
edited

The remaining occurrences of wayland.withLibraries are in

  • pkgs/development/libraries/wayland/protocols.nix
  • pkgs/tools/graphics/mesa-demos/default.nix (well...)

and also wayland.bin in

  • pkgs/applications/networking/browsers/chromium/common.nix

@alyssais alyssais force-pushed the wayland-scanner branch 2 times, most recently from 69b36a9 to 97f8b5d Compare February 6, 2023 11:38
@ofborg ofborg bot requested a review from andersk February 6, 2023 12:23
@alyssais
Copy link
Member Author

alyssais commented Feb 6, 2023 •
edited

Things that still need to be checked:

  • nix-review to catch packages that relied on wayland in buildInputs and strictDeps = false to get wayland-scanner
  • test cross compilation of all packages that directly depend on wayland-scanner (they might need pkg-config in depsBuildBuild now)

@alyssais alyssais force-pushed the wayland-scanner branch 2 times, most recently from cf02f4c to 365caa5 Compare February 8, 2023 22:11
@ofborg ofborg bot requested a review from eadwu February 8, 2023 22:31
@ofborg ofborg bot requested a review from chvp February 8, 2023 23:16
SuperSandro2000
SuperSandro2000 approved these changes Feb 10, 2023
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Thanks for cleaning this up

@alyssais alyssais force-pushed the wayland-scanner branch 2 times, most recently from 1d41c53 to 40cbc34 Compare February 10, 2023 13:14
@alyssais
plasma5Packages.plasma-integration: depend on wayland-scanner
714dd2f 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
plasma5Packages.plasma-remotecontrollers: depend on wayland-scanner
e06c801 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
plasma5Packages.plasma-workspace: depend on wayland-scanner
74967b1 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
plasma5Packages.xdg-desktop-portal-kde: depend on wayland-scanner
e9e1e9c 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
python3.pkgs.pywayland: depend on wayland-scanner
ef45e8a 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
qt5.qtwayland: depend on wayland-scanner
44e4a83 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
qt-video-wlr: depend on wayland-scanner
fd97869 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
river: depend on wayland-scanner
a3298fd 
Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
@alyssais
river-tag-overlay: depend on wayland-scanner
d301456 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
rofi-wayland: depend on wayland-scanner
7939194 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
squeekboard: depend on wayland-scanner
f25875f 
Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
@alyssais
tofi: depend on wayland-scanner
7c1feda 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
vaapiIntel: depend on wayland-scanner
dd6d8f4 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
vlc: depend on wayland-scanner
603bbaa 
Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
@alyssais
vulkan-cts: depend on wayland-scanner
0214389 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
vulkan-tools: depend on wayland-scanner
3fdbdb2 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
waffle: depend on wayland-scanner
9c2c619 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
way-displays: depend on wayland-scanner
25197ea 
Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
@alyssais
waylock: depend on wayland-scanner
4abeffa 
Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
@alyssais
webkitgtk: depend on wayland-scanner
fc66773 
Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.
@alyssais
wio: depend on wayland-scanner
b13934e 
Otherwise, wayland-scanner would be picked up from the wayland in
buildInputs, which isn't cross-friendly and will stop working when we
split wayland-scanner into a separate package.
@alyssais
plasma5Packages.extra-cmake-modules: fix FindWayland.cmake
a0ccdb9 
This isn't important yet, but it's about to be, when we split
wayland-scanner into its own package.
@alyssais
wayland: clean up
e80c541 
substituteAll is unused.

passthru.version was added in e574da8 ("wayland: Always build
documentation") with no specific explanation or immediate use.  I
assume it's obsolete, since wayland.version does the same thing with
or without the passthru attribute, and I don't see anything in Nixpkgs
that looks like it's specifically accessing Wayland's
passthru.version.
@alyssais
wayland-scanner: split from wayland
b53dd2c 
We've used a wayland-scanner = wayland.bin alias for ages, to make
packages clearer and allow them to be independently overridden.
Going the whole way into splitting them into separate packages is
useful because it means we can have different meta.platforms
attributes for libwayland and wayland-scanner.

There is no duplication in outputs between the two packages — they
don't install any files in common.

Since we're no longer pulling just one output into nativeBuildInputs
of packages using wayland-scanner, we can use upstream's
wayland-scanner.pc, which gets installed into the dev output, rather
than providing our own.
@alyssais
clightd: fix cross
0c62839
@wineee wineee mentioned this pull request Aug 22, 2023
Merged
12 tasks
@wegank wegank added 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 2.status: merge conflict labels Mar 19, 2024
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@codyopel codyopel Awaiting requested review from codyopel

@primeos primeos Awaiting requested review from primeos

@wegank wegank Awaiting requested review from wegank

@andersk andersk Awaiting requested review from andersk

@eadwu eadwu Awaiting requested review from eadwu

@chvp chvp Awaiting requested review from chvp

@jtojnar jtojnar Awaiting requested review from jtojnar jtojnar will be requested when the pull request is marked ready for review jtojnar is a code owner

@K900 K900 Awaiting requested review from K900 K900 will be requested when the pull request is marked ready for review K900 is a code owner

@NickCao NickCao Awaiting requested review from NickCao NickCao will be requested when the pull request is marked ready for review NickCao is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel will be requested when the pull request is marked ready for review ttuegel is a code owner

Assignees
No one assigned
Labels
2.status: merge conflict 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: python 6.topic: qt/kde 8.has: package (new) 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@alyssais @wegank @SuperSandro2000 @Mindavi