Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libwacom: Fix libwacom-show-stylus #372392

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

JohnAZoidberg
Copy link
Member

It would fail like this:

> libwacom-show-stylus
Error: No module named 'libevdev'
One or more python modules are missing. Please install those modules and re-run this tool.

Or even earlier if the system does not have any python3:

> sudo libwacom-show-stylus
/usr/bin/env: ‘python3’: No such file or directory

With this change it can work:

> sudo ./result/bin/libwacom-show-stylus
Using "ILIT2901:00 222A:0001 Stylus": /dev/input/event7
Using stylus file(s): /nix/store/995gjgcafxbssn50k3bhksws7jnb28cx-libwacom-2.14.0/share/libwacom/lenovo.stylus, /nix/store/995gjgcafxbssn50k3bhksws7jnb28cx-libwacom-2.14.0/share/libwacom/wacom.stylus
Tool id 0x0 serial 0xff in-proximity: False

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

It would fail like this:

```
> libwacom-show-stylus
Error: No module named 'libevdev'
One or more python modules are missing. Please install those modules and re-run this tool.
```

Or even earlier if the system does not have any python3:

```
> sudo libwacom-show-stylus
/usr/bin/env: ‘python3’: No such file or directory
```

With this change it can work:

```
> sudo ./result/bin/libwacom-show-stylus
Using "ILIT2901:00 222A:0001 Stylus": /dev/input/event7
Using stylus file(s): /nix/store/995gjgcafxbssn50k3bhksws7jnb28cx-libwacom-2.14.0/share/libwacom/lenovo.stylus, /nix/store/995gjgcafxbssn50k3bhksws7jnb28cx-libwacom-2.14.0/share/libwacom/wacom.stylus
Tool id 0x0 serial 0xff in-proximity: False
```

Signed-off-by: Daniel Schaefer <[email protected]>
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500 labels Jan 9, 2025
@nix-owners nix-owners bot requested review from jtojnar and dotlambda January 9, 2025 14:49
pp.libevdev
pp.pyudev
]))

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

@@ -37,14 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
meson
ninja
python3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not needed at build time? Does cross compilation still work?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 101-500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants