diff --git a/flake.lock b/flake.lock index 4d09b0e..9dd6d31 100644 --- a/flake.lock +++ b/flake.lock @@ -328,15 +328,16 @@ "plover": { "flake": false, "locked": { - "lastModified": 1652639506, - "narHash": "sha256-2sS5jnpIHV2j23vDMS4ka2neRTcEyLH+zs7Og+Ysjvg=", - "owner": "openstenoproject", + "lastModified": 1648942277, + "narHash": "sha256-SiGt8tgB3haT+NsU7BOZZRSZ6FkrkHlabDPOoiCPoNw=", + "owner": "benoit-pierre", "repo": "plover", - "rev": "486a032f7bd50d1df3ddff47f407e77a4cfe0bc6", + "rev": "9aa7c562ba8c6cf8fdd56b0a8304865cc58bc322", "type": "github" }, "original": { - "owner": "openstenoproject", + "owner": "benoit-pierre", + "ref": "wayland-sway", "repo": "plover", "type": "github" } diff --git a/flake.nix b/flake.nix index c77806e..b7209c5 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ kreative-open-relay.flake = false; nasin-nanpa.url = "github:ETBCOR/nasin-nanpa"; nasin-nanpa.flake = false; - plover.url = "github:openstenoproject/plover"; + plover.url = "github:benoit-pierre/plover/wayland-sway"; plover.flake = false; regenpfeifer.url = "github:mkrnr/regenpfeifer"; regenpfeifer.flake = false; diff --git a/misc/plover.nix b/misc/plover.nix index 993bdfe..1f4147e 100644 --- a/misc/plover.nix +++ b/misc/plover.nix @@ -87,10 +87,19 @@ in rec { # I'm not sure why we don't find PyQt5 here but there's a similar # sed on many of the platforms Plover builds for - postPatch = "sed -i /PyQt5/d setup.cfg"; + postPatch = '' + sed -i /PyQt5/d setup.cfg + sed -i 's/pywayland==0.4.11/pywayland>=0.4.11/' reqs/constraints.txt + substituteInPlace plover_build_utils/setup.py \ + --replace "/usr/share/wayland/wayland.xml" "${wayland}/share/wayland/wayland.xml" + ''; checkInputs = [pytest mock]; - propagatedBuildInputs = [babel pyqt5 xlib pyserial appdirs wcwidth setuptools plover-stroke rtf-tokenize]; + propagatedBuildInputs = [babel pyqt5 xlib pyserial appdirs wcwidth setuptools plover-stroke rtf-tokenize pywayland xkbcommon]; + nativeBuildInputs = [ + wayland + pkg-config + ]; installCheckPhase = "true";