pyrox.dev
lol
Merge pull request #231630 from OPNA2608/fix/mir_keyboard_missing
mir: Pull patch to fix evdev device misses
+11
-5
-5
nixos/tests/miriway.nix
-5
nixos/tests/miriway.nix
···
3
3
4
4
meta = {
5
5
maintainers = with lib.maintainers; [ OPNA2608 ];
6
-
# Natively running Mir has problems with capturing the first registered libinput device.
7
-
# In our VM runners on ARM and on some hardware configs (my RPi4, distro-independent), this misses the keyboard.
8
-
# It can be worked around by dis- and reconnecting the affected hardware, but we can't do this in these tests.
9
-
# https://github.com/MirServer/mir/issues/2837
10
-
broken = pkgs.stdenv.hostPlatform.isAarch;
11
6
};
12
7
13
8
nodes.machine = { config, ... }: {
+11
pkgs/servers/mir/default.nix
+11
pkgs/servers/mir/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, gitUpdater
5
6
, cmake
6
7
, pkg-config
···
56
57
rev = "v${version}";
57
58
hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY=";
58
59
};
60
+
61
+
patches = [
62
+
# Fixes Mir being able to drop first input device on launch
63
+
# Drop when https://github.com/MirServer/mir/issues/2837 fixed in a release
64
+
(fetchpatch {
65
+
name = "0001-mir-Simplify_probing_of_evdev_input_platform.patch";
66
+
url = "https://github.com/MirServer/mir/commit/7787cfa721934bb43d3255218e7c92e700923fcb.patch";
67
+
hash = "sha256-9C9qcmngd+K8EAcyOYUJFTdFDu1Nt1MM7Y9TRNOXFB4=";
68
+
})
69
+
];
59
70
60
71
postPatch = ''
61
72
# Fix scripts that get run in tests