Skip to content

Commit d3dea7a

Browse files
committed
add input device config interface
Issue: #384
1 parent f293a2a commit d3dea7a

File tree

6 files changed

+406
-2
lines changed

6 files changed

+406
-2
lines changed

.github/workflows/archlinux-build-wlroots-17.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
pacman --noconfirm --noprogressbar -Syu
2222
- name: Install dep
2323
run: |
24-
pacman -Syu --noconfirm --noprogressbar base-devel qt6-base qt6-declarative cmake pkgconfig pixman wlroots wayland-protocols git
24+
pacman -Syu --noconfirm --noprogressbar base-devel qt6-base qt6-declarative cmake pkgconfig pixman wlroots wayland-protocols git libinput
2525
pacman -Syu --noconfirm --noprogressbar clang ninja make
2626
pacman -Syu --noconfirm --noprogressbar fakeroot meson sudo
2727
- name: Set up user

debian/control

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 9),
1414
libpixman-1-dev,
1515
libxcb-ewmh-dev,
1616
wayland-protocols,
17-
wlr-protocols
17+
wlr-protocols,
18+
libinput-dev
1819
Standards-Version: 3.9.8
1920

2021
Package: libwaylib

nix/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
, wlr-protocols
1414
, pixman
1515
, libdrm
16+
, libinput
1617
, nixos-artwork
1718

1819
# only for test
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
6061
wlr-protocols
6162
pixman
6263
libdrm
64+
libinput
6365
];
6466

6567
propagatedBuildInputs = [

src/server/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ pkg_search_module(PIXMAN REQUIRED IMPORTED_TARGET pixman-1)
2929
pkg_search_module(XKBCOMMON REQUIRED IMPORTED_TARGET xkbcommon)
3030
pkg_search_module(XCB REQUIRED IMPORTED_TARGET xcb)
3131
pkg_search_module(EGL REQUIRED IMPORTED_TARGET egl)
32+
pkg_search_module(LIBINPUT REQUIRED IMPORTED_TARGET libinput)
3233

3334
ws_generate(
3435
server
@@ -334,6 +335,7 @@ target_link_libraries(${TARGET}
334335
PkgConfig::XKBCOMMON
335336
PkgConfig::XCB
336337
PkgConfig::EGL
338+
PkgConfig::LIBINPUT
337339
)
338340

339341
set(CMAKE_INCLUDE_CURRENT_DIR ON)

0 commit comments

Comments
 (0)