push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/libinput-gestures b/libinput-gestures
index 78c7c28..da04007 100755
--- a/libinput-gestures
+++ b/libinput-gestures
@@ -27,7 +27,7 @@ except ImportError:
session_locked = False
-PROGPATH = Path(sys.argv[0])
+PROGPATH = Path("libinput-gestures")
PROGNAME = PROGPATH.stem
# Conf file containing gesture commands.

View File

@@ -0,0 +1,34 @@
diff --git a/libinput-gestures b/libinput-gestures
index 78c7c28..1a2c965 100755
--- a/libinput-gestures
+++ b/libinput-gestures
@@ -87,11 +87,11 @@ def get_libinput_vers():
'Return the libinput installed version number string'
# Try to use newer libinput interface then fall back to old
# (depreciated) interface.
- res = run(('libinput', '--version'), check=False)
+ res = run(('@libinput@', '--version'), check=False)
if res:
return res.strip(), True
- res = run(('libinput-list-devices', '--version'), check=False)
+ res = run(('@libinput-list-devices@', '--version'), check=False)
return res and res.strip(), False
def get_devices_list(cmd_list_devices, device_list):
@@ -694,11 +694,11 @@ def main():
sys.exit('libinput helper tools do not seem to be installed?')
if has_subcmd:
- cmd_debug_events = 'libinput debug-events'
- cmd_list_devices = 'libinput list-devices'
+ cmd_debug_events = '@libinput@ debug-events'
+ cmd_list_devices = '@libinput@ list-devices'
else:
- cmd_debug_events = 'libinput-debug-events'
- cmd_list_devices = 'libinput-list-devices'
+ cmd_debug_events = '@libinput@-debug-events'
+ cmd_list_devices = '@libinput@-list-devices'
if args.verbose:
# Output various info/version info

View File

@@ -0,0 +1,62 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
libinput,
wmctrl,
python3,
coreutils,
xdotool ? null,
extraUtilsPath ? lib.optional (xdotool != null) xdotool,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libinput-gestures";
version = "2.79";
src = fetchFromGitHub {
owner = "bulletmark";
repo = "libinput-gestures";
tag = finalAttrs.version;
hash = "sha256-oMteEOx2bwPBLgxB9uSE7zuR5vmuqX6J1Tk5nxefWa4=";
};
patches = [
./0001-hardcode-name.patch
./0002-paths.patch
];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 ];
postPatch = ''
substituteInPlace libinput-gestures-setup --replace-fail /usr/ /
substituteInPlace libinput-gestures \
--replace-fail /etc "$out/etc" \
--subst-var-by libinput "${libinput}/bin/libinput" \
--subst-var-by wmctrl "${wmctrl}/bin/wmctrl"
'';
installPhase = ''
runHook preInstall
${stdenv.shell} libinput-gestures-setup -d "$out" install
runHook postInstall
'';
postFixup = ''
rm "$out/bin/libinput-gestures-setup"
substituteInPlace "$out/share/systemd/user/libinput-gestures.service" --replace "/usr" "$out"
substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out"
chmod +x "$out/share/applications/libinput-gestures.desktop"
wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${
lib.makeBinPath ([ coreutils ] ++ extraUtilsPath)
}"
'';
meta = {
homepage = "https://github.com/bulletmark/libinput-gestures";
description = "Gesture mapper for libinput";
mainProgram = "libinput-gestures";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ teozkr ];
};
})