Skip to content
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.

Sign up for GitHub

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

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

Merged
merged 3 commits into from
Sep 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
648a996
CMakeLists: look for wayland.xml protocol in wayland-scanner pkgdata
andresilva Sep 1, 2024
16cc935
nix: add pkg-config to depsBuildBuild
fufexan Sep 1, 2024
1214418
flake.lock: update
fufexan Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
18 changes: 9 additions & 9 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ stdenv.mkDerivation {
--replace GIT_COMMIT_HASH '"${commit}"'
'';

depsBuildBuild = [
pkg-config
];

cmakeBuildType =
if debug
then "Debug"
Expand All @@ -49,6 +53,7 @@ stdenv.mkDerivation {
cmake
hyprwayland-scanner
pkg-config
wayland-scanner
];

buildInputs = [
Expand All @@ -70,7 +75,6 @@ stdenv.mkDerivation {
pcre2
wayland
wayland-protocols
wayland-scanner
xorg.libXdmcp
util-linux
];
Expand Down
Loading