Commit graph

107 commits

Author SHA1 Message Date
Weijia Wang 1352481e8e wayland: use epoll-shim on unix platforms 2023-03-23 17:52:18 +02:00
Weijia Wang baeb7fb75b
Merge pull request #222547 from wegank/wayland-protocols-darwin
wayland-protocols: do not check with a non-BFD linker
2023-03-23 07:32:40 +02:00
Weijia Wang 3d1d0bf910 wayland: allow building without tests 2023-03-22 18:15:22 +02:00
Weijia Wang 7b93912f0e wayland-protocols: do not check with a non-BFD linker 2023-03-22 17:19:52 +02:00
Alyssa Ross 1c561baac6
Revert "wayland: mark as broken on darwin"
This reverts commit d9986a53ee.

That commit turned a package that built for macOS into a package that
was marked broken for both (also breaking the wayland-scanner
attribute, which is important for cross-compiling to Linux), and
complicated the mesa-demos expression, with no explanation given and
only four hours of opportunity for review.
2023-02-05 22:21:32 +00:00
Weijia Wang d9986a53ee wayland: mark as broken on darwin 2023-01-29 07:44:40 +01:00
Guillaume Girol 33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Alyssa Ross 2017fba3a2
wayland-protocols: broaden platforms
It's just some XML files!
2022-12-09 17:31:26 +00:00
Alyssa Ross 53b6c15df2
wayland-protocols: only run tests with libwayland 2022-12-09 17:31:24 +00:00
Alyssa Ross 11dffd155d
Revert "wayland: broken for darwin"
This reverts commit c5ef875426.

Doesn't seem to be a problem any more.
2022-12-09 17:31:23 +00:00
Alyssa Ross 93b89c7bfc
wayland: disable tests if libraries are disabled
This fixes the withLibraries = false build.
2022-12-09 17:31:21 +00:00
Cole Mickens ea10118993
wayland-protocols: 1.30 -> 1.31 (#204057)
Release announcement:
https://lists.freedesktop.org/archives/wayland-devel/2022-November/042524.html
2022-12-04 18:24:44 +01:00
Michael Weiss a7517380b5
wayland-protocols: 1.29 -> 1.30
Release announcement:
https://lists.freedesktop.org/archives/wayland-devel/2022-November/042517.html
2022-11-23 20:27:48 +01:00
Michael Weiss 24d02f17a9
wayland-protocols: 1.27 -> 1.29
Release announcements:
- 1.28: https://lists.freedesktop.org/archives/wayland-devel/2022-November/042490.html
- 1.29: https://lists.freedesktop.org/archives/wayland-devel/2022-November/042499.html
2022-11-15 22:38:58 +01:00
Cole Mickens e206a56eb1 wayland-protocols: 1.26 -> 1.27 2022-10-14 17:37:00 +03:00
Artturin 4885138129 treewide: remove unnecessary meson find_program patches
they are unnecessary since 32e36bd429f804fd1468f51e39020f7360d8a5a8
https://github.com/NixOS/nixpkgs/pull/183507
2022-08-01 20:03:47 +03:00
Michael Weiss e60e4e0136
wayland-protocols: 1.25 -> 1.26
Release announcement:
https://lists.freedesktop.org/archives/wayland-devel/2022-July/042270.html
2022-07-09 12:22:45 +02:00
Michael Weiss 257a807568
wayland: 1.20.0 -> 1.21.0
Release announcements:
- Alpha: https://lists.freedesktop.org/archives/wayland-devel/2022-May/042194.html
- Beta: https://lists.freedesktop.org/archives/wayland-devel/2022-June/042228.html
- RC1: https://lists.freedesktop.org/archives/wayland-devel/2022-June/042261.html
- 1.21: https://lists.freedesktop.org/archives/wayland-devel/2022-June/042268.html

The URLs of the release tarballs did change as can be seen on the
website [0] (the old URL scheme doesn't work anymore).

[0]: https://wayland.freedesktop.org/releases.html
2022-07-04 22:51:00 +02:00
Michael Weiss 0de04fef7d
wayland-protocols: 1.24 -> 1.25
Announcement and release notes:
https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html
2022-01-29 00:49:36 +01:00
Michael Weiss 8fc77f9168
Merge pull request #148588 from primeos/wayland
wayland: 1.19.0 -> 1.20.0
2021-12-11 22:04:57 +01:00
Michael Weiss fd0dec68ee
wayland: 1.19.0 -> 1.20.0
Announcement: https://lists.freedesktop.org/archives/wayland-devel/2021-December/042064.html
2021-12-10 22:25:40 +01:00
SCOTT-HAMILTON f64b0ef6cf wayland: fix static build 2021-12-07 22:01:37 +00:00
Michael Weiss 92992026be wayland-protocols: 1.23 -> 1.24 2021-11-24 01:34:38 +00:00
Artturin 77ed6024ca wayland: fix build with strictDeps 2021-11-05 19:57:03 +02:00
Michael Weiss ee936a60ae
wayland-protocols: 1.22 -> 1.23 2021-09-16 00:39:21 +02:00
Michael Weiss ee043b60e2
wayland-protocols: 1.21 -> 1.22 2021-09-01 20:24:36 +02:00
github-actions[bot] 0a0c0a9fb9
Merge staging-next into staging 2021-05-20 18:36:04 +00:00
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Michael Francis c5ef875426 wayland: broken for darwin 2021-05-19 17:56:21 -07:00
Michael Weiss d916642bc5
Merge pull request #121727 from primeos/wayland-protocols-switch-to-meson
wayland-protocols: Switch to Meson
2021-05-17 16:52:10 +02:00
Michael Weiss a605e0318d
Merge pull request #122475 from stephank/fix-wayland-darwin
wayland: fix build on darwin
2021-05-12 20:18:48 +02:00
Stéphan Kochen 6543ad4db0
wayland: fix build on darwin 2021-05-11 12:16:59 +02:00
Michael Weiss a893df3f9f
wayland-protocols: Switch to Meson
According to diffoscope this is fine (only the Nix store path changes).

Cross-compilation with doCheck=true is broken (requires pkg-config in
nativeBuildInputs but doesn't play nicely with checkInputs).
2021-05-05 22:00:26 +02:00
Michael Weiss 62b0f89f4e
Merge pull request #121726 from primeos/wayland-scanner-fix-cross-compilation
wayland{.bin,-scanner}: Add a pkg-config file for cross-compilation
2021-05-05 21:59:13 +02:00
Michael Weiss b062135493
wayland{.bin,-scanner}: Add a pkg-config file for cross-compilation
Only "wayland_scanner" and "Version" are required so it's easier to
create wayland-scanner.pc manually than to copy it from $dev and avoid
dependency cycles.
2021-05-04 20:43:50 +02:00
Michael Weiss 1be2221634
wayland-protocols: 1.20 -> 1.21
Announcement:
https://lists.freedesktop.org/archives/wayland-devel/2021-April/041815.html
2021-04-30 21:45:59 +02:00
Michael Weiss 6a30a601c7
wayland: Add a "bin" and "dev" output
Another advantage is that we can now use the wayland-scanner alias for
nativeBuildInputs (which is less confusing than adding "wayland" to both
nativeBuildInputs and buildInputs).
2021-04-03 15:31:27 +02:00
Michael Weiss ea099211e0
wayland: Refactor the Nix expression
This should make it a bit easier to read, expat is not optional (only
for cross-compiling - WIP), and fetchpatch is no longer required.
2021-04-03 13:36:34 +02:00
Alyssa Ross ae758ea389
wayland: add myself to maintainers 2021-04-02 19:06:52 +02:00
Alyssa Ross 4d8adb49d5
wayland: fix build on non-Linux
The Wayland libraries themselves only build on Linux, but other
platforms need wayland-scanner for cross-compiling to Linux.  So for
them, disable the libraries so only wayland-scanner is built.
2021-04-02 19:06:27 +02:00
Michael Weiss 106ca78aff
wayland: 1.18.0 -> 1.19.0 (#107324)
Announcements:
- Alpha: https://lists.freedesktop.org/archives/wayland-devel/2020-December/041668.html
- Beta: https://lists.freedesktop.org/archives/wayland-devel/2021-January/041683.html
- RC1: https://lists.freedesktop.org/archives/wayland-devel/2021-January/041691.html
- Final: https://lists.freedesktop.org/archives/wayland-devel/2021-January/041692.html
2021-01-28 16:46:53 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Florian Klink ab0607e337
wayland: fix cross (#105103)
substituteInPlace stopped working, let's replace this with a patch which
is more reliable.
2020-11-27 12:09:53 +01:00
Alyssa Ross dfe75b97ca
wayland: make reproducible
Upstream MR:
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/93
2020-10-29 13:14:08 +00:00
Alyssa Ross ee5f7058a4
wayland: documentation outputs
Build the documentation by default, but install it to seperate outputs
so it doesn't have to be downloaded.  Documentation is still disabled
when cross-compiling, because that is currently broken:
wayland -> graphviz -> libdevil -> openexr -> ilmbase (broken)
2020-07-04 12:22:59 +00:00
John Ericson f005272623 wayland: Simplify cross build
Now that we have a pkg-config wrapper, we can get build-time deps via
pkg-config.
2020-05-27 17:27:24 +00:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michael Weiss 95e3292eed
wayland-protocols: 1.18 -> 1.20
Release announcements and changelogs:
- 1.19: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041267.html
- 1.20: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html
2020-02-29 21:32:07 +01:00
Michael Weiss ded18bd210
wayland-protocols: Update meta and add myself as maintainer 2020-02-12 12:46:10 +01:00
Michael Weiss de3f4fe900
wayland: Fix the cross-compilation with Meson
The build sandbox provides only wayland-scanner and not the library and
the wayland-egl symbols check test must use nm prefixed with the target
triplet.
2020-02-12 12:46:09 +01:00