diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix index a1d059d26dae..09fa4c71998d 100644 --- a/pkgs/applications/display-managers/sddm/unwrapped.nix +++ b/pkgs/applications/display-managers/sddm/unwrapped.nix @@ -13,7 +13,7 @@ qtdeclarative, qtquickcontrols2 ? null, systemd, - xkeyboardconfig, + xkeyboard-config, nixosTests, docutils, }: @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/greeter/waylandkeyboardbackend.cpp \ - --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" + --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml" ''; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 46c7eb81c2b1..f886c4942f29 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -27,7 +27,7 @@ cups, alsa-lib, - xkeyboardconfig, + xkeyboard-config, autoPatchelfHook, wrapQtAppsHook, }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { autoPatchelfHook wrapQtAppsHook ]; - propagatedBuildInputs = [ xkeyboardconfig ]; + propagatedBuildInputs = [ xkeyboard-config ]; buildInputs = [ dbus cups @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/googleearth-pro \ --set QT_QPA_PLATFORM xcb \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" + --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" ''; meta = { diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix index 1711200a3c8a..087d701ea053 100644 --- a/pkgs/by-name/id/ideamaker/package.nix +++ b/pkgs/by-name/id/ideamaker/package.nix @@ -22,7 +22,7 @@ shared-mime-info, stdenv, writeShellApplication, - xkeyboardconfig, + xkeyboard-config, }: let pname = "ideamaker"; @@ -86,7 +86,7 @@ stdenv.mkDerivation { preFixup = '' wrapProgram $out/bin/ideamaker \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \ --set QTCOMPOSE "${libX11.out}/share/X11/locale" \ --set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \ --set NIX_REDIRECTS /usr/share=$out/share/ diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix index 4a6c6a36aac9..21e0d65489b6 100644 --- a/pkgs/by-name/sa/saleae-logic/package.nix +++ b/pkgs/by-name/sa/saleae-logic/package.nix @@ -30,7 +30,7 @@ zlib, pciutils, makeDesktopItem, - xkeyboardconfig, + xkeyboard-config, dbus, runtimeShell, libGL, @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { cat > "$out/bin/saleae-logic" << EOF #!${runtimeShell} export LD_PRELOAD="$out/lib/preload.so" - export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" + export QT_XKB_CONFIG_ROOT="${xkeyboard-config}/share/X11/xkb" export PATH="${pciutils}/bin:\$PATH" exec "$out/Logic" "\$@" EOF diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix index 9f4663e3942d..e74af9de4eed 100644 --- a/pkgs/by-name/sy/synergy/package.nix +++ b/pkgs/by-name/sy/synergy/package.nix @@ -21,7 +21,7 @@ libXtst, libXrandr, libXinerama, - xkeyboardconfig, + xkeyboard-config, xinput, avahi-compat, libsForQt5, @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \ - --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" + --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/xk/xkeyboard-config/custom.nix b/pkgs/by-name/xk/xkeyboard-config/custom.nix index 374112f51b08..0e5663009450 100644 --- a/pkgs/by-name/xk/xkeyboard-config/custom.nix +++ b/pkgs/by-name/xk/xkeyboard-config/custom.nix @@ -1,4 +1,4 @@ -# xkeyboardconfig variant extensible with custom layouts. +# xkeyboard-config variant extensible with custom layouts. # See nixos/modules/services/x11/extra-layouts.nix { lib, diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix index b496850c5e00..4f1b6a80cdb0 100644 --- a/pkgs/by-name/xo/xorg-server/package.nix +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -42,7 +42,7 @@ pixman, udev, xkbcomp, - xkeyboardconfig, + xkeyboard-config, xorgproto, xtrans, zlib, @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { "-Ddefault_font_path=" "-Dxkb_bin_dir=${xkbcomp}/bin" - "-Dxkb_dir=${xkeyboardconfig}/share/X11/xkb" + "-Dxkb_dir=${xkeyboard-config}/share/X11/xkb" "-Dxkb_output_dir=$out/share/X11/xkb/compiled" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index c81ee24becee..9629ebc62bdc 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -26,7 +26,7 @@ xcbutilrenderutil, xcbutilwm, xkbcomp, - xkeyboardconfig, + xkeyboard-config, xorgproto, xtrans, }: @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-xquartz" "--disable-xwayland" "--with-xkb-bin-directory=${xkbcomp}/bin" - "--with-xkb-path=${xkeyboardconfig}/share/X11/xkb" + "--with-xkb-path=${xkeyboard-config}/share/X11/xkb" "--with-xkb-output=$out/share/X11/xkb/compiled" ] ++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 0f3822490511..9d38b075135a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,7 +21,7 @@ kirigami ? null, kirigami2 ? null, isocodes, - xkeyboardconfig, + xkeyboard-config, libxkbfile, libplasma ? null, plasma-framework ? null, @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { kitemviews kwidgetsaddons isocodes - xkeyboardconfig + xkeyboard-config libxkbfile ] ++ lib.optionals (lib.versions.major qtbase.version == "5") [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index abc48b2f2d53..4ad25d64d538 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1961,6 +1961,7 @@ mapAliases { xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22 xinput_calibrator = xinput-calibrator; # Added 2025-08-28 xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22 + xkeyboardconfig = xkeyboard-config; # Added 2026-02-04 xkeyboardconfig_custom = xkeyboard-config_custom; # Added 2026-01-19 xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27 xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82d4756bd2f6..b5940a80b157 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8868,7 +8868,6 @@ with pkgs; xf86inputevdev = xf86-input-evdev; xf86inputlibinput = xf86-input-libinput; xf86videonouveau = xf86-video-nouveau; - xkeyboardconfig = xkeyboard-config; zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};