plover wayland

This commit is contained in:
Charlotte 🦝 Delenk 2022-06-28 09:51:16 +01:00
parent db9f5c78e7
commit da89c4f5b2
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 18 additions and 8 deletions

View file

@ -328,15 +328,16 @@
"plover": { "plover": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1652639506, "lastModified": 1648942277,
"narHash": "sha256-2sS5jnpIHV2j23vDMS4ka2neRTcEyLH+zs7Og+Ysjvg=", "narHash": "sha256-SiGt8tgB3haT+NsU7BOZZRSZ6FkrkHlabDPOoiCPoNw=",
"owner": "openstenoproject", "owner": "benoit-pierre",
"repo": "plover", "repo": "plover",
"rev": "486a032f7bd50d1df3ddff47f407e77a4cfe0bc6", "rev": "9aa7c562ba8c6cf8fdd56b0a8304865cc58bc322",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "openstenoproject", "owner": "benoit-pierre",
"ref": "wayland-sway",
"repo": "plover", "repo": "plover",
"type": "github" "type": "github"
} }

View file

@ -23,7 +23,7 @@
kreative-open-relay.flake = false; kreative-open-relay.flake = false;
nasin-nanpa.url = "github:ETBCOR/nasin-nanpa"; nasin-nanpa.url = "github:ETBCOR/nasin-nanpa";
nasin-nanpa.flake = false; nasin-nanpa.flake = false;
plover.url = "github:openstenoproject/plover"; plover.url = "github:benoit-pierre/plover/wayland-sway";
plover.flake = false; plover.flake = false;
regenpfeifer.url = "github:mkrnr/regenpfeifer"; regenpfeifer.url = "github:mkrnr/regenpfeifer";
regenpfeifer.flake = false; regenpfeifer.flake = false;

View file

@ -87,10 +87,19 @@ in rec {
# I'm not sure why we don't find PyQt5 here but there's a similar # 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 # 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]; 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"; installCheckPhase = "true";