-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat: allow running in native wayland #7053
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.
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
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |||||
| ((gnu packages python-crypto) #:select (python-asn1crypto)) | ||||||
| ((gnu packages tls) #:select (openssl)) | ||||||
| ((gnu packages version-control) #:select (git-minimal)) | ||||||
| ((gnu packages xml) #:select (expat)) | ||||||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not clear why this is different
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| (guix build-system cmake) | ||||||
| (guix build-system gnu) | ||||||
| (guix build-system python) | ||||||
|
|
@@ -536,7 +537,8 @@ inspecting signatures in Mach-O binaries.") | |||||
| ((string-contains target "-linux-") | ||||||
| (list bison | ||||||
| (list gcc-toolchain-12 "static") | ||||||
| (make-bitcoin-cross-toolchain target))) | ||||||
| (make-bitcoin-cross-toolchain target) | ||||||
| expat)) | ||||||
| ((string-contains target "darwin") | ||||||
| (list clang-toolchain-19 | ||||||
| lld-19 | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package := libffi | ||
| $(package)_version := 3.4.2 | ||
| $(package)_download_path := https://github.com/libffi/$(package)/releases/download/v$($(package)_version) | ||
| $(package)_file_name := $(package)-$($(package)_version).tar.gz | ||
| $(package)_sha256_hash := 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620 | ||
|
|
||
| define $(package)_set_vars | ||
| $(package)_config_opts := --enable-option-checking --disable-dependency-tracking | ||
| $(package)_config_opts += --enable-shared --disable-static --disable-docs | ||
| $(package)_config_opts += --disable-multi-os-directory | ||
| # libffi uses GNU C extensions (asm, ssize_t) that require gnu11 instead of c11 | ||
| $(package)_cflags := -std=gnu11 | ||
|
Comment on lines
+11
to
+12
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. notable difference |
||
| endef | ||
|
|
||
| define $(package)_config_cmds | ||
| $($(package)_autoconf) | ||
| endef | ||
|
|
||
| define $(package)_build_cmds | ||
| $(MAKE) | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| $(MAKE) DESTDIR=$($(package)_staging_dir) install | ||
| endef | ||
|
|
||
| define $(package)_postprocess_cmds | ||
| rm -rf share | ||
| endef | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package := libglvnd | ||
| $(package)_version := 1.4.0 | ||
| $(package)_download_path := https://gitlab.freedesktop.org/glvnd/$(package)/-/archive/v$($(package)_version) | ||
| $(package)_file_name := $(package)-v$($(package)_version).tar.bz2 | ||
| $(package)_sha256_hash := fdf395391d95f270528dbff6ce2ee54c186753d286ad62e0da5f62c6f67ba915 | ||
|
|
||
| define $(package)_set_vars | ||
| $(package)_config_opts := --enable-option-checking --disable-dependency-tracking | ||
| $(package)_config_opts += --enable-shared --disable-static | ||
| $(package)_config_opts += --disable-x11 --disable-gles1 | ||
| endef | ||
|
|
||
| define $(package)_config_cmds | ||
| ./autogen.sh && \ | ||
| $($(package)_autoconf) | ||
| endef | ||
|
|
||
| define $(package)_build_cmds | ||
| $(MAKE) | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| $(MAKE) DESTDIR=$($(package)_staging_dir) install | ||
| endef | ||
|
|
||
| define $(package)_postprocess_cmds | ||
| rm lib/*.la | ||
| endef |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package := native_wayland_scanner | ||
| $(package)_version := 1.19.0 | ||
| $(package)_download_path := https://wayland.freedesktop.org/releases | ||
| $(package)_file_name := wayland-$($(package)_version).tar.xz | ||
| $(package)_sha256_hash := baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 | ||
|
|
||
| define $(package)_set_vars | ||
| $(package)_config_opts := --enable-option-checking --disable-dependency-tracking | ||
| $(package)_config_opts += --disable-libraries --disable-documentation | ||
| $(package)_config_opts += --disable-dtd-validation | ||
| endef | ||
|
|
||
| define $(package)_config_cmds | ||
| EXPAT_LIBS=$$$$(env -u PKG_CONFIG_LIBDIR PKG_CONFIG_PATH=$(SYSTEM_PKG_CONFIG_PATH) pkg-config --libs expat) \ | ||
| EXPAT_CFLAGS=$$$$(env -u PKG_CONFIG_LIBDIR PKG_CONFIG_PATH=$(SYSTEM_PKG_CONFIG_PATH) PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 pkg-config --cflags expat) \ | ||
| $($(package)_autoconf) | ||
| endef | ||
|
|
||
| define $(package)_build_cmds | ||
| $(MAKE) | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| $(MAKE) DESTDIR=$($(package)_staging_dir) install | ||
| endef |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package := wayland | ||
| native_package := native_wayland_scanner | ||
| $(package)_version := $($(native_package)_version) | ||
| $(package)_download_path := $($(native_package)_download_path) | ||
| $(package)_file_name := $($(native_package)_file_name) | ||
| $(package)_sha256_hash := $($(native_package)_sha256_hash) | ||
| $(package)_dependencies := $(native_package) libffi expat | ||
|
|
||
| define $(package)_set_vars | ||
| $(package)_config_opts := --enable-option-checking --disable-dependency-tracking | ||
| $(package)_config_opts += --enable-shared --disable-static --disable-documentation | ||
| $(package)_config_opts += --disable-dtd-validation --with-host-scanner | ||
| $(package)_cflags += -D_GNU_SOURCE | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. notable difference |
||
| endef | ||
|
|
||
| define $(package)_config_cmds | ||
| ac_cv_have_decl_CLOCK_MONOTONIC=yes $($(package)_autoconf) | ||
| endef | ||
|
|
||
| define $(package)_build_cmds | ||
| $(MAKE) | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| $(MAKE) DESTDIR=$($(package)_staging_dir) install | ||
| endef | ||
|
|
||
| define $(package)_postprocess_cmds | ||
| rm lib/*.la | ||
| endef | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
need to update also doc/build-unix.md and other related files