mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-07 21:43:32 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
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
|