diff --git a/pkgs/additional/sxmo-utils/0003-fix-xkb-paths.patch b/pkgs/additional/sxmo-utils/0003-fix-xkb-paths.patch new file mode 100644 index 00000000..10d91e9f --- /dev/null +++ b/pkgs/additional/sxmo-utils/0003-fix-xkb-paths.patch @@ -0,0 +1,19 @@ +diff --git a/scripts/core/sxmo_swayinitconf.sh b/scripts/core/sxmo_swayinitconf.sh +index c4afcd6..80f593c 100755 +--- a/scripts/core/sxmo_swayinitconf.sh ++++ b/scripts/core/sxmo_swayinitconf.sh +@@ -60,13 +60,13 @@ focused_name="$( + swaymsg -- input type:touch map_to_output "$focused_name" + swaymsg -- input type:tablet_tool map_to_output "$focused_name" + +-swaymsg -- input "$pwr" xkb_file "$(xdg_data_path sxmo/sway/xkb_mobile_normal_buttons)" ++swaymsg -- input "$pwr" xkb_file "$(xdg_data_path sxmo/xkb/xkb_mobile_normal_buttons)" + + if ! [ "$vols" = "none" ]; then + for vol in $vols; do + swaymsg -- input "$vol" repeat_delay 200 + swaymsg -- input "$vol" repeat_rate 15 +- swaymsg -- input "$vol" xkb_file "$(xdg_data_path sxmo/sway/xkb_mobile_normal_buttons)" ++ swaymsg -- input "$vol" xkb_file "$(xdg_data_path sxmo/xkb/xkb_mobile_normal_buttons)" + done + fi diff --git a/pkgs/additional/sxmo-utils/default.nix b/pkgs/additional/sxmo-utils/default.nix index c7775a3c..cdef8b58 100644 --- a/pkgs/additional/sxmo-utils/default.nix +++ b/pkgs/additional/sxmo-utils/default.nix @@ -17,11 +17,13 @@ stdenv.mkDerivation rec { patches = [ ./0001-group-differs-from-user.patch ./0002-ensure-log-dir.patch + ./0003-fix-xkb-paths.patch ]; postPatch = '' sed -i 's@/usr/lib/udev/rules\.d@/etc/udev/rules.d@' Makefile sed -i "s@/etc/profile\.d/sxmo_init.sh@$out/etc/profile.d/sxmo_init.sh@" scripts/core/*.sh + sed -i "s@/usr/bin/@@g" scripts/core/sxmo_version.sh ''; installFlags = [