diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e48137..09b6305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,8 +67,9 @@ add_executable(hyprpaper ${SRCFILES}) pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}") -pkg_get_variable(WAYLAND_CLIENT_DIR wayland-client pkgdatadir) -message(STATUS "Found wayland-client at ${WAYLAND_CLIENT_DIR}") +pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir) +message( + STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}") function(protocolnew protoPath protoName external) if(external) @@ -90,7 +91,7 @@ function(protocolWayland) OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp 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}) target_sources(hyprpaper PRIVATE protocols/wayland.cpp protocols/wayland.hpp) endfunction() diff --git a/nix/default.nix b/nix/default.nix index b52e2ad..8e32f18 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation { cmake hyprwayland-scanner pkg-config + wayland-scanner ]; buildInputs = [ @@ -70,7 +71,6 @@ stdenv.mkDerivation { pcre2 wayland wayland-protocols - wayland-scanner xorg.libXdmcp util-linux ];