Skip to content

Commit

Permalink
Merge pull request NixOS#216999 from OPNA2608/update/miriway
Browse files Browse the repository at this point in the history
miriway: Bump, link to upstream issue for VM test problem
  • Loading branch information
NickCao authored Feb 20, 2023
2 parents f7255bf + 0de3431 commit 504e2f1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
6 changes: 5 additions & 1 deletion nixos/tests/miriway.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {

meta = {
maintainers = with lib.maintainers; [ OPNA2608 ];
# FIXME On ARM Miriway inside the VM doesn't receive keyboard inputs, why?
# 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;
};

Expand All @@ -30,6 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
enable = true;
config = ''
add-wayland-extensions=all
enable-x11=
ctrl-alt=t:foot --maximized
ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty --option window.startup_mode=maximized
Expand Down
15 changes: 3 additions & 12 deletions pkgs/applications/window-managers/miriway/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,15 @@

stdenv.mkDerivation rec {
pname = "miriway";
version = "unstable-2022-12-18";
version = "unstable-2023-02-18";

src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "d294c303cb99b7becb0d6686be9a09f0a1f57596";
hash = "sha256-H+IZgI1IQxNl5yAygbDKXkyXajGHV/mp9gEqZcp0TeE=";
rev = "1363ae0452c5093f84418bc65354e93796caec65";
hash = "sha256-hQ2z3GlTJG9qewJLkPpoRMSn0D7xCLyl+1O+G4NnedA=";
};

postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${CMAKE_INSTALL_PREFIX}/bin" "\''${CMAKE_INSTALL_BINDIR}" \
--replace "/usr/share" "\''${CMAKE_INSTALL_DATADIR}" \
--replace "/etc" "\''${CMAKE_INSTALL_SYSCONFDIR}"
sed -i -e '/project(/a include(GNUInstallDirs)' CMakeLists.txt
'';

strictDeps = true;

nativeBuildInputs = [
Expand Down

0 comments on commit 504e2f1

Please sign in to comment.