Commit graph

52 commits

Author SHA1 Message Date
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 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 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 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 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
Michael Weiss c16b065cc9
wayland: Add a flag to build the documentation
But don't build the documentation by default.
2020-02-12 12:46:09 +01:00
Michael Weiss 1c82542488
wayland: 1.17.0 -> 1.18.0
This also switches the build from Autotools to Meson. The only
difference should be that the libtool archives (.la files) aren't
generated anymore.
Additionally I've updated the meta attributes and added myself as
maintainer.

The changelog is in the final release announcement [0] and an overview
of most commits is in the alpha release announcement [1].

[0]: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html
[1]: https://lists.freedesktop.org/archives/wayland-devel/2020-January/041140.html
2020-02-12 12:46:08 +01:00
Will Dietz 480293b6f6 wayland: 1.16.0 -> 1.17.0
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040291.html
2019-03-21 16:25:00 -05:00
Yorick be5181bc47
wayland: separateDebugInfo = true 2019-01-31 15:47:51 +01:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Jörg Thalheim fbb114107d
wayland: fix cross-build 2018-11-28 01:06:42 +00:00
R. RyanTM 01f68e8f6b wayland: 1.15.0 -> 1.16.0 (#45795)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
wayland
2018-08-31 13:46:46 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
R. RyanTM f43da349ba wayland: 1.14.0 -> 1.15.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wayland/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -h’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --help’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner help’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -v’ and found version 1.15.0
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --version’ and found version 1.15.0
- found 1.15.0 with grep in /nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0
- directory tree listing: https://gist.github.com/4f5bd9b49f975338e758858eb2b89e4d
2018-04-10 09:41:36 -07:00
Samuel Dionne-Riel 7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Joerg Thalheim c30d535c7b wayland: 1.12.0 -> 1.14.0 2017-11-20 17:20:17 +00:00
Nikolay Amiantov 54b27890f8 wayland: fix configure flags' type 2017-01-31 03:23:51 +03:00
Alexander Ried d334e9e1f6 wayland: 1.11.0 -> 1.12.0 2016-09-21 11:16:32 +02:00
Alexander Ried 85a525c8a1 wayland: 1.10.0 -> 1.11.0 2016-06-01 10:27:34 +02:00
Alexander Ried 7f2d418954 wayland: 1.9.0 -> 1.10.0 2016-04-08 23:22:58 +02:00
William A. Kennington III 283dd9fe49 wayland: 1.8.1 -> 1.9.0 2015-09-22 14:30:16 -07:00
William A. Kennington III 0967c0fcdb wayland: 1.7.0 -> 1.8.1 2015-06-18 21:58:45 -07:00
Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Eelco Dolstra b5dea5c86a Fix wayland 2015-06-04 14:54:48 +02:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
Eelco Dolstra eb5c161640 wayland: Fewer build-time dependencies 2015-05-13 18:17:26 +02:00
William A. Kennington III e574da83de wayland: Always build documentation 2015-02-19 09:57:16 -08:00
codyopel a53da93b2b wayland: 1.6.0 -> 1.7.0 & add optionals
All non-essential dependencies are now optional, with exception
to wayland-scanner which if not enabled causes wayland to fail to build
2015-02-19 09:47:40 -08:00
William A. Kennington III c70b942375 wayland: 1.5.0 -> 1.6.0 2014-10-16 23:17:38 -07:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Vladimír Čunát fa1eaf84f4 wayland, weston: update 1.4.0 -> 1.5.0 2014-06-17 09:00:29 +02:00
Vladimír Čunát c9b581b5d4 wayland: update 1.3.0 -> 1.4.0 2014-01-25 21:01:40 +01:00
Vladimír Čunát 30666ed5ad wayland, weston: update to 1.3.1, fix weston build
Also make Hydra build weston, so we can see the breakages in future.
2013-11-23 23:31:48 +01:00
Vladimír Čunát e902ca15ab update wayland deps needed for gtk+ 3.10 2013-10-05 21:27:32 +02:00
Carles Pagès d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix
2013-02-18 20:15:59 +01:00
Carles Pagès bd8428efa1 wayland: update to 1.0.5.
Also updated weston to 1.0.5, and got rid of the patch that's no longer needed.
They fixed it upstream even if it was actually caused by our pkg-config patch.
2013-02-18 19:57:27 +01:00
Shea Levy 2a1c308607 Add wayland library 2013-02-16 23:06:31 -05:00
Carles Pagès bc9a291779 wayland: update to 1.0.4.
Also updated weston to 1.0.4, which now fails to build. Doh!
2013-01-28 19:45:07 +01:00