Skip to content

Commit

Permalink
mir: Pull patch to fix evdev device misses
Browse files Browse the repository at this point in the history
  • Loading branch information
OPNA2608 committed May 15, 2023
1 parent 1f68716 commit 447657c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
5 changes: 0 additions & 5 deletions nixos/tests/miriway.nix
Expand Up @@ -3,11 +3,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {

meta = {
maintainers = with lib.maintainers; [ OPNA2608 ];
# Natively running Mir has problems with capturing the first registered libinput device.
# In our VM runners on ARM and on some hardware configs (my RPi4, distro-independent), this misses the keyboard.
# It can be worked around by dis- and reconnecting the affected hardware, but we can't do this in these tests.
# https://github.com/MirServer/mir/issues/2837
broken = pkgs.stdenv.hostPlatform.isAarch;
};

nodes.machine = { config, ... }: {
Expand Down
11 changes: 11 additions & 0 deletions pkgs/servers/mir/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, gitUpdater
, cmake
, pkg-config
Expand Down Expand Up @@ -57,6 +58,16 @@ stdenv.mkDerivation rec {
hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY=";
};

patches = [
# Fixes Mir being able to drop first input device on launch
# Drop when https://github.com/MirServer/mir/issues/2837 fixed in a release
(fetchpatch {
name = "0001-mir-Simplify_probing_of_evdev_input_platform.patch";
url = "https://github.com/MirServer/mir/commit/7787cfa721934bb43d3255218e7c92e700923fcb.patch";
hash = "sha256-9C9qcmngd+K8EAcyOYUJFTdFDu1Nt1MM7Y9TRNOXFB4=";
})
];

postPatch = ''
# Fix scripts that get run in tests
patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
Expand Down

0 comments on commit 447657c

Please sign in to comment.