mirror of
https://github.com/quickshell-mirror/quickshell.git
synced 2026-10-27 02:54:36 +00:00
build: fix cross compilation
This commit is contained in:
2 files changed
+11
-9
No files matched your search
+4
-2
@@ -54,11 +54,13 @@
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
qt6.qtshadertools
|
||||
spirv-tools
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optional withWayland wayland-scanner;
|
||||
++ lib.optionals withWayland [
|
||||
qt6.qtwayland # qtwaylandscanner required at build time
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
find_package(PkgConfig REQUIRED)
|
||||
find_package(WaylandScanner REQUIRED)
|
||||
pkg_check_modules(wayland REQUIRED IMPORTED_TARGET wayland-client wayland-protocols)
|
||||
pkg_check_modules(wayland REQUIRED IMPORTED_TARGET wayland-client wayland-protocols>=1.41)
|
||||
|
||||
# wayland protocols
|
||||
|
||||
@@ -12,13 +12,13 @@ if(NOT TARGET Qt6::qtwaylandscanner)
|
||||
message(FATAL_ERROR "qtwaylandscanner executable not found. Most likely there is an issue with your Qt installation.")
|
||||
endif()
|
||||
|
||||
execute_process(
|
||||
COMMAND pkg-config --variable=pkgdatadir wayland-protocols
|
||||
OUTPUT_VARIABLE WAYLAND_PROTOCOLS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
pkg_get_variable(WAYLAND_PROTOCOLS wayland-protocols pkgdatadir)
|
||||
|
||||
message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
|
||||
if(WAYLAND_PROTOCOLS)
|
||||
message(STATUS "Found wayland protocols at ${WAYLAND_PROTOCOLS}")
|
||||
else()
|
||||
message(FATAL_ERROR "Could not find wayland protocols")
|
||||
endif()
|
||||
|
||||
qs_add_pchset(wayland-protocol
|
||||
DEPENDENCIES Qt::Core Qt::WaylandClient Qt::WaylandClientPrivate
|
||||
|
||||
Reference in new issue
Block a user