hyprwm
/
hyprpaper
mirror of https://github.com/hyprwm/hyprpaper.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMakeLists: look for wayland.xml protocol in wayland-scanner pkgdata

This commit is contained in:
André Silva 2024-09-01 13:06:23 +01:00 committed by Mihai Fufezan
parent 91e17e12ff
commit 6c6e54faa8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -67,8 +67,9 @@ add_executable(hyprpaper ${SRCFILES})
pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}") message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
pkg_get_variable(WAYLAND_CLIENT_DIR wayland-client pkgdatadir) pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir)
message(STATUS "Found wayland-client at ${WAYLAND_CLIENT_DIR}") message(
STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}")
function(protocolnew protoPath protoName external) function(protocolnew protoPath protoName external)
if(external) if(external)
@ -90,7 +91,7 @@ function(protocolWayland)
OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp
${CMAKE_SOURCE_DIR}/protocols/wayland.hpp ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp
COMMAND hyprwayland-scanner --wayland-enums --client COMMAND hyprwayland-scanner --wayland-enums --client
${WAYLAND_CLIENT_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/ ${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
target_sources(hyprpaper PRIVATE protocols/wayland.cpp protocols/wayland.hpp) target_sources(hyprpaper PRIVATE protocols/wayland.cpp protocols/wayland.hpp)
endfunction() endfunction()

2
nix/default.nix
View File

@ -49,6 +49,7 @@ stdenv.mkDerivation {
cmake cmake
hyprwayland-scanner hyprwayland-scanner
pkg-config pkg-config
wayland-scanner
]; ];
buildInputs = [ buildInputs = [
@ -70,7 +71,6 @@ stdenv.mkDerivation {
pcre2 pcre2
wayland wayland
wayland-protocols wayland-protocols
wayland-scanner
xorg.libXdmcp xorg.libXdmcp
util-linux util-linux
]; ];