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: 0.33 -> 1.1 #69182
libwacom: 0.33 -> 1.1 #69182
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm seeing upstream uses the meson build system, can you port to using this?
I know for sure we'll need to disable the tests.
mesonFlags = [
"-Dtests=false"
];
Can you also add the udev rules to the wacom module?
I believe it should be as simple as adding this package at
services.udev.packages = [ pkgs.xf86_input_wacom ]; |
Sure! I also noticed this and am excited to see it, I just didn't know that it would be preferable to switch already, since it's still new. I'll do this now.
I was thinking about doing this kind of thing in a followup PR. As for why I don't just add it there, I have some reservations: This is an X11 specific file, but these udev rules are just as important if you are using Wayland. Would it make sense to perhaps have a |
Ported to use Meson. |
🎆 Meson 😄
It appears to be organized at |
So here's the diff between the --- /nix/store/ljvlm1b2fyqci1kli0ljbfmr2mizs97m-libwacom-0.33/lib/pkgconfig/libwacom.pc 1969-12-31 19:00:01.000000000 -0500
+++ /nix/store/m5izrmjgx82b60i8a9sfmfb1lhki84ga-libwacom-1.1-dev/lib/pkgconfig/libwacom.pc 1969-12-31 19:00:01.000000000 -0500
@@ -1,11 +1,9 @@
-prefix=/nix/store/ljvlm1b2fyqci1kli0ljbfmr2mizs97m-libwacom-0.33
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=/nix/store/i75ix7wz0p0sk0948sfkax74vpkpxh10-libwacom-1.1
+libdir=${prefix}/lib
+includedir=/nix/store/m5izrmjgx82b60i8a9sfmfb1lhki84ga-libwacom-1.1-dev/include
-Name: libwacom
+Name: Libwacom
Description: Wacom model feature query library
-Version: 0.33
-Requires.private: glib-2.0
-Cflags: -I${includedir}/libwacom-1.0
+Version: 1.1
Libs: -L${libdir} -lwacom
+Cflags: -I${includedir}/libwacom-1.0 No use of |
Interesting. My best guess is its an artifact of switching to Meson. I'm currently running May be worth filing a bug upstream if there's real benefit to having |
I'm filing a bug upstream. It looks like this difference between autotools and meson is not intended. The current autotools build still contains the |
We actual patch away the main thing with Requires.private
Thanks, I made a PR also. So I guess those rules can get unconditionally added to the libinput module, or only when the wacom option is turned on. |
Despite the version jump, as far as I can tell there are no incompatible or even large changes; just one new API and some bugfixes/added devices. This release also installs udev rules by default, which will aid in fixing #52490.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
(was previously checked, but it turns out I ran the wrong command, currently rerunning.)./result/bin/
)nix path-info -S
before and after)I've ran the gnome3 NixOS test and I am using this build locally with SwayWM without issue.