xf86-input-{cmt,wacom}: rename from xf86_input_{cmt,wacom} to fit package naming conventions (#470275)

nixos/modules/services/x11/hardware/cmt.nix

@@ -85,7 +85,7 @@ in
 
   config = mkIf cfg.enable {
 
-    services.xserver.modules = [ pkgs.xf86_input_cmt ];
+    services.xserver.modules = [ pkgs.xf86-input-cmt ];
 
     environment.etc = {
       "${etcPath}/40-touchpad-cmt.conf" = {

nixos/modules/services/x11/hardware/wacom.nix

@@ -39,14 +39,14 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom
+    environment.systemPackages = [ pkgs.xf86-input-wacom ]; # provides xsetwacom
 
-    services.xserver.modules = [ pkgs.xf86_input_wacom ];
+    services.xserver.modules = [ pkgs.xf86-input-wacom ];
 
-    services.udev.packages = [ pkgs.xf86_input_wacom ];
+    services.udev.packages = [ pkgs.xf86-input-wacom ];
 
     environment.etc."X11/xorg.conf.d/70-wacom.conf".source =
-      "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf";
+      "${pkgs.xf86-input-wacom}/share/X11/xorg.conf.d/70-wacom.conf";
 
   };
 

nixos/modules/services/x11/xserver.nix

@@ -365,7 +365,7 @@ in
       modules = mkOption {
         type = types.listOf types.path;
         default = [ ];
-        example = literalExpression "[ pkgs.xf86_input_wacom ]";
+        example = literalExpression "[ pkgs.xf86-input-wacom ]";
         description = "Packages to be added to the module search path of the X server.";
       };
 

pkgs/kde/plasma/wacomtablet/default.nix

@@ -2,7 +2,7 @@
   mkKdeDerivation,
   pkg-config,
   libwacom,
-  xf86_input_wacom,
+  xf86-input-wacom,
 }:
 mkKdeDerivation {
   pname = "wacomtablet";
@@ -10,7 +10,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     libwacom
-    xf86_input_wacom
+    xf86-input-wacom
   ];
   meta.mainProgram = "kde_wacom_tabletfinder";
 }

pkgs/top-level/aliases.nix

@@ -1696,6 +1696,8 @@ mapAliases {
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
   xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27
+  xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12
+  xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12
   xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
   xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28