diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-05-29 20:18:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-29 20:18:57 +0200 |
| commit | d14b8ea6d4337d67f39ffd6464e897cc79e5829d (patch) | |
| tree | deda68a3e1f3b701007f4b5638dcb5aac80c26c6 | |
| parent | Merge pull request #234831 from NixOS/backport-234756-to-release-23.05 (diff) | |
| parent | mir: Pull patch to fix evdev device misses (diff) | |
| download | nixpkgs-d14b8ea6d4337d67f39ffd6464e897cc79e5829d.tar.gz | |
Merge pull request #234052 from NixOS/backport-231630-to-release-23.05
| -rw-r--r-- | nixos/tests/miriway.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/mir/default.nix | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix index d0d9f16d40f9..9000e9278197 100644 --- a/nixos/tests/miriway.nix +++ b/nixos/tests/miriway.nix @@ -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, ... }: { diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 45c9efc7b2ca..ea6976cdd6cd 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , gitUpdater , cmake , pkg-config @@ -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 |