aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2025-11-04 19:04:56 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix cross compilation

Browse source
This commit is contained in:
outfoxxed 2025-09-28 18:55:45 -07:00
parent b9cce25061
commit d4b19e4a30
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -54,11 +54,13 @@
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
ninja ninja
qt6.qtshadertools
spirv-tools spirv-tools
pkg-config pkg-config
] ]
++ lib.optional withWayland wayland-scanner; ++ lib.optionals withWayland [
qt6.qtwayland # qtwaylandscanner required at build time
wayland-scanner
];
buildInputs = [ buildInputs = [
qt6.qtbase qt6.qtbase

14
src/wayland/CMakeLists.txt
View file

@ -1,6 +1,6 @@
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
find_package(WaylandScanner 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 # 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.") message(FATAL_ERROR "qtwaylandscanner executable not found. Most likely there is an issue with your Qt installation.")
endif() endif()
execute_process( pkg_get_variable(WAYLAND_PROTOCOLS wayland-protocols pkgdatadir)
COMMAND pkg-config --variable=pkgdatadir wayland-protocols
OUTPUT_VARIABLE WAYLAND_PROTOCOLS
OUTPUT_STRIP_TRAILING_WHITESPACE
)
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 qs_add_pchset(wayland-protocol
DEPENDENCIES Qt::Core Qt::WaylandClient Qt::WaylandClientPrivate DEPENDENCIES Qt::Core Qt::WaylandClient Qt::WaylandClientPrivate