diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 0e46fd0178de..410b53b78741 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -38,7 +38,7 @@ libxcb, libxkbcommon, mesa-demos, - xcbutilwm, + libxcb-wm, xcbutilrenderutil, xcbutilkeysyms, xcbutilimage, @@ -171,7 +171,7 @@ let libX11 libxcb libxkbcommon - xcbutilwm + libxcb-wm xcbutilrenderutil xcbutilkeysyms xcbutilimage diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix index f2af8b405600..4b46e0d75e43 100644 --- a/pkgs/applications/version-management/p4v/linux.nix +++ b/pkgs/applications/version-management/p4v/linux.nix @@ -27,7 +27,7 @@ xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, }: { @@ -69,7 +69,7 @@ let xcbutilimage xcbutilkeysyms xcbutilrenderutil - xcbutilwm + libxcb-wm ]; dontBuild = true; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index f6c9e6f274c8..95dc5c5fecf6 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -4,7 +4,7 @@ vdr, alsa-lib, fetchFromGitHub, - xcbutilwm, + libxcb-wm, xorg-server, ffmpeg, libva, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ vdr - xcbutilwm + libxcb-wm ffmpeg alsa-lib libva diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index 8e8131a0062d..a9317c1bdedc 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -5,7 +5,7 @@ patches, libxcb, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, libX11, xcbutil, xcbutilxrm, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb xcbutilkeysyms - xcbutilwm + libxcb-wm libX11 xcbutil xcbutilxrm diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 73fc79d4c56a..5e843f9212de 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -15,7 +15,7 @@ pkg-config, libxcb-cursor, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, xcbutil, xmodmap, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { pcre2 libxcb-cursor xcbutilkeysyms - xcbutilwm + libxcb-wm xcbutil ]; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index b1a2b94df040..78594c879346 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -10,7 +10,7 @@ libxcb, xcbutilkeysyms, xcbutil, - xcbutilwm, + libxcb-wm, xcbutilxrm, libstartup_notification, libX11, @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb xcbutilkeysyms xcbutil - xcbutilwm + libxcb-wm xcbutilxrm libxkbcommon libstartup_notification diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 2a96830ffef7..6c3177fdae96 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -14,7 +14,7 @@ libinput, libxkbcommon, vulkan-headers, - xcbutilwm, + libxcb-wm, gtkmm3, withFiltersPlugin ? true, withFocusRequestPlugin ? true, @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { libinput libxkbcommon vulkan-headers - xcbutilwm + libxcb-wm gtkmm3 ]; diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index 0f723a613e20..a085b71442a1 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -44,7 +44,7 @@ wayland-protocols, wayland-scanner, xcbutil, - xcbutilwm, + libxcb-wm, xz, # Boolean flags buildManPages ? true, @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols xcbutil - xcbutilwm + libxcb-wm xz ] ++ lib.optionals (!useBuiltinLua) [ luajit ] diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix index 0675fb730d59..9efd5ca13852 100644 --- a/pkgs/by-name/bi/binaryninja-free/package.nix +++ b/pkgs/by-name/bi/binaryninja-free/package.nix @@ -15,7 +15,7 @@ xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, libxml2, }: stdenv.mkDerivation (finalAttrs: { @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutilimage xcbutilkeysyms xcbutilrenderutil - xcbutilwm + libxcb-wm ]; installPhase = '' diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix index e7052cb87b54..b881e71e08f0 100644 --- a/pkgs/by-name/bs/bspwm/package.nix +++ b/pkgs/by-name/bs/bspwm/package.nix @@ -6,7 +6,7 @@ libXinerama, xcbutil, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, nixosTests, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { libXinerama xcbutil xcbutilkeysyms - xcbutilwm + libxcb-wm ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix index 0d7e15158985..8f8e06024e1a 100644 --- a/pkgs/by-name/ca/cage/package.nix +++ b/pkgs/by-name/ca/cage/package.nix @@ -14,7 +14,7 @@ wayland-protocols, pixman, libxkbcommon, - xcbutilwm, + libxcb-wm, libGL, libX11, xwayland ? null, @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols pixman libxkbcommon - xcbutilwm + libxcb-wm libGL libX11 ]; diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix index 5f4a1d2c5b01..adabf5144bfc 100644 --- a/pkgs/by-name/ca/cagebreak/package.nix +++ b/pkgs/by-name/ca/cagebreak/package.nix @@ -8,7 +8,7 @@ libevdev, libinput, libxkbcommon, - xcbutilwm, + libxcb-wm, makeWrapper, meson, ninja, @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { libevdev libinput libxkbcommon - xcbutilwm + libxcb-wm pango pixman systemd diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix index b357d7333fb5..88094a8d9f17 100644 --- a/pkgs/by-name/dk/dk/package.nix +++ b/pkgs/by-name/dk/dk/package.nix @@ -4,7 +4,7 @@ fetchFromBitbucket, xcbutil, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, libxcb-cursor, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ xcbutil xcbutilkeysyms - xcbutilwm + libxcb-wm libxcb-cursor ]; diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix index 0c28d18fa496..748a464ad63e 100644 --- a/pkgs/by-name/dw/dwl/package.nix +++ b/pkgs/by-name/dw/dwl/package.nix @@ -16,7 +16,7 @@ wayland-scanner, wlroots_0_18, writeText, - xcbutilwm, + libxcb-wm, xwayland, # Boolean flags enableXWayland ? true, @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableXWayland [ libX11 - xcbutilwm + libxcb-wm xwayland ]; diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix index e8ce78821b61..573072b2f013 100644 --- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix +++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix @@ -12,7 +12,7 @@ ladspa-sdk, libxcb, lv2, - xcbutilwm, + libxcb-wm, libxcb-util, zita-convolver, zita-resampler, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ladspa-sdk libxcb lv2 - xcbutilwm + libxcb-wm libxcb-util zita-convolver zita-resampler diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 7c7c9bc4db8a..c39d3e161152 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -23,7 +23,7 @@ wayland-protocols, wayland-scanner, wlroots_0_19, - xcbutilwm, + libxcb-wm, xwayland, }: @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols wlroots_0_19 - xcbutilwm + libxcb-wm xwayland ]; diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix index c38a269f0121..725d0c73fd82 100644 --- a/pkgs/by-name/lu/luastatus/package.nix +++ b/pkgs/by-name/lu/luastatus/package.nix @@ -25,7 +25,7 @@ libxcb, libX11, xcbutil, - xcbutilwm, + libxcb-wm, }: stdenv.mkDerivation (finalAttrs: { @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb libX11 xcbutil - xcbutilwm + libxcb-wm libXdmcp libXau libpulseaudio diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mangowc/package.nix index 88e87d30d75e..1a0bb75f0a1d 100644 --- a/pkgs/by-name/ma/mangowc/package.nix +++ b/pkgs/by-name/ma/mangowc/package.nix @@ -12,7 +12,7 @@ wayland, wayland-protocols, wayland-scanner, - xcbutilwm, + libxcb-wm, xwayland, enableXWayland ? true, meson, @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableXWayland [ libX11 - xcbutilwm + libxcb-wm xwayland ]; diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix index e34b7081d4d9..a22eeb8a7277 100644 --- a/pkgs/by-name/nx/nxwitness-client/package.nix +++ b/pkgs/by-name/nx/nxwitness-client/package.nix @@ -20,7 +20,7 @@ xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, }: let version = "6.0.6"; @@ -48,7 +48,7 @@ let xcbutilimage xcbutilkeysyms xcbutilrenderutil - xcbutilwm + libxcb-wm ]; meta = { diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index df6b9378799b..74ab0f5e4582 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -19,7 +19,7 @@ libxcb-cursor, xcbutilimage, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, xcbutilxrm, makeWrapper, removeReferencesTo, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb-cursor xcbutilimage xcbutilrenderutil - xcbutilwm + libxcb-wm xcbutilxrm ] ++ lib.optional alsaSupport alsa-lib diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix index 308302dae498..cd89ba9b40aa 100644 --- a/pkgs/by-name/ro/rofi-unwrapped/package.nix +++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix @@ -27,7 +27,7 @@ xcbutil, libxcb-cursor, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, xcbutilxrm, waylandSupport ? true, x11Support ? true, @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutil libxcb-cursor xcbutilkeysyms - xcbutilwm + libxcb-wm xcbutilxrm ]; diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix index 1ba9df2cf31f..0b0466ea1f43 100644 --- a/pkgs/by-name/sc/scenefx/package.nix +++ b/pkgs/by-name/sc/scenefx/package.nix @@ -15,7 +15,7 @@ libGL, libgbm, libxcb, - xcbutilwm, + libxcb-wm, validatePkgConfig, testers, wayland-scanner, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libgbm libxcb - xcbutilwm + libxcb-wm pixman wayland wayland-protocols diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix index 97e930bf1fc0..34dcfbe96297 100644 --- a/pkgs/by-name/sp/spectrwm/package.nix +++ b/pkgs/by-name/sp/spectrwm/package.nix @@ -10,7 +10,7 @@ libXt, xcbutil, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, writeShellScript, curl, jq, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libXt xcbutil xcbutilkeysyms - xcbutilwm + libxcb-wm libbsd ]; diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index 6192c86efad2..3fda6fd4c897 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -24,7 +24,7 @@ scdoc, scenefx, wayland-scanner, - xcbutilwm, + libxcb-wm, wlroots_0_19, testers, nixosTests, @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; }) ] - ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ]; + ++ lib.optionals finalAttrs.enableXWayland [ libxcb-wm ]; mesonFlags = let diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix index 3a454b69034e..b426d6866a89 100644 --- a/pkgs/by-name/sx/sxhkd/package.nix +++ b/pkgs/by-name/sx/sxhkd/package.nix @@ -7,7 +7,7 @@ libxcb, xcbutil, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, nixosTests, }: @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb xcbutil xcbutilkeysyms - xcbutilwm + libxcb-wm ]; strictDeps = true; diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix index 62c1101460f9..bba04b3ba4ad 100644 --- a/pkgs/by-name/vk/vkmark/package.nix +++ b/pkgs/by-name/vk/vkmark/package.nix @@ -13,7 +13,7 @@ glm, assimp, libxcb, - xcbutilwm, + libxcb-wm, nix-update-script, }: @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { glm assimp libxcb - xcbutilwm + libxcb-wm wayland wayland-protocols ]; diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index 6e2a6f298ed3..125e63ab5e5a 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -16,7 +16,7 @@ wayland, which, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, valijson, vulkan-headers, vulkan-loader, @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-utility-libraries wayland xcbutilkeysyms - xcbutilwm + libxcb-wm qt6.qtbase qt6.qtwayland ]; diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index 4514c110313c..0a5f55f571ac 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -48,7 +48,7 @@ xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, p7zip, onetbb, wayland, @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { libXScrnSaver xcbutilkeysyms xcbutilrenderutil - xcbutilwm + libxcb-wm onetbb wayland ]; diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 7970ca56c2c5..fdf62e3ee6af 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -28,7 +28,7 @@ atkmm, libdrm, libxkbcommon, - xcbutilwm, + libxcb-wm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, @@ -84,7 +84,7 @@ let stdenv.cc.libc pango zlib - xcbutilwm + libxcb-wm xcbutilimage xcbutilkeysyms xcbutilrenderutil diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 57db01c1ab11..6cbdb1fdcbe1 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -22,7 +22,7 @@ xcbutil, xcbutilimage, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, zlib, }: @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage rec { xcbutil xcbutilimage xcbutilkeysyms - xcbutilwm # contains xcb-ewmh among others + libxcb-wm # contains xcb-ewmh among others ]; buildFeatures = [ "distro-defaults" ]; diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix index 24c2105d6ff0..ec5ee9cf6471 100644 --- a/pkgs/by-name/wi/windowchef/package.nix +++ b/pkgs/by-name/wi/windowchef/package.nix @@ -6,7 +6,7 @@ libXrandr, xcbutil, xcbutilkeysyms, - xcbutilwm, + libxcb-wm, xcbproto, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { libXrandr xcbutil xcbutilkeysyms - xcbutilwm + libxcb-wm xcbproto ]; diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index 331274f75466..20d87cb6cb99 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -31,7 +31,7 @@ pkg-config, systemd, xcbutil, - xcbutilwm, + libxcb-wm, xcbutilimage, xkbcomp, xkeyboard_config, @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalPackages: rec { pixman systemd xcbutil - xcbutilwm + libxcb-wm xcbutilimage xkbcomp xkeyboard_config diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix index c7378e84ef1c..ba37370206b4 100644 --- a/pkgs/by-name/xd/xdo/package.nix +++ b/pkgs/by-name/xd/xdo/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libxcb, xcbutil, - xcbutilwm, + libxcb-wm, }: stdenv.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb - xcbutilwm + libxcb-wm xcbutil ]; diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix index 6c4893ac1836..c6c0d007b3b6 100644 --- a/pkgs/by-name/xt/xtitle/package.nix +++ b/pkgs/by-name/xt/xtitle/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libxcb, xcbutil, - xcbutilwm, + libxcb-wm, git, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb git xcbutil - xcbutilwm + libxcb-wm ]; meta = { diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index 9629ebc62bdc..bc3aff578674 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -24,7 +24,7 @@ xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, xkbcomp, xkeyboard-config, xorgproto, @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutilimage xcbutilkeysyms xcbutilrenderutil - xcbutilwm + libxcb-wm xorgproto xtrans ]; diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix index 788c05c86834..bbe16bc6462b 100644 --- a/pkgs/by-name/ya/yambar/package.nix +++ b/pkgs/by-name/ya/yambar/package.nix @@ -24,7 +24,7 @@ xcbutil, libxcb-cursor, xcbutilerrors, - xcbutilwm, + libxcb-wm, waylandSupport ? true, x11Support ? true, }: @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutil libxcb-cursor xcbutilerrors - xcbutilwm + libxcb-wm ]; strictDeps = true; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0720a23b8936..4a218f751697 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -46,7 +46,7 @@ xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, zlib, at-spi2-core, @@ -135,7 +135,7 @@ stdenv.mkDerivation ( xcbutilimage xcbutilkeysyms xcbutilrenderutil - xcbutilwm + libxcb-wm ] ++ lib.optional libGLSupported libGL ); diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index cdbe8f0740d1..26370795cbd2 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -60,7 +60,7 @@ xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, - xcbutilwm, + libxcb-wm, zlib, at-spi2-core, unixODBC, @@ -157,7 +157,7 @@ stdenv.mkDerivation rec { xcbutilimage xcbutilkeysyms xcbutilrenderutil - xcbutilwm + libxcb-wm libxdmcp libxtst libxcb-cursor diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index efb7eb0c4804..e7ed8e255fa8 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -30,7 +30,7 @@ wayland-scanner, wlroots, libxcb-cursor, - xcbutilwm, + libxcb-wm, xcffib, nixosTests, extraPackages ? [ ], @@ -112,7 +112,7 @@ buildPythonPackage (finalAttrs: { libxkbcommon wayland wlroots - xcbutilwm + libxcb-wm ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 4287ee5e00f6..de02a1038ddc 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -30,7 +30,7 @@ libdatrie, xcbutilkeysyms, xcbutil, - xcbutilwm, + libxcb-wm, xcb-imdkit, libxkbfile, nixosTests, @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon xcbutil - xcbutilwm + libxcb-wm xcbutilkeysyms xcb-imdkit xkeyboard_config diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 18a6e7f8e01f..42a1b4c30d2f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1909,6 +1909,7 @@ mapAliases { xcb-util-cursor = libxcb-cursor; # Added 2026-02-04 xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12 xcbutilcursor = libxcb-cursor; # Added 2026-02-04 + xcbutilwm = libxcb-wm; # Added 2026-02-04 xcursorthemes = xcursor-themes; # Added 2026-01-19 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 113be95794e5..09149d73317d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8860,7 +8860,6 @@ with pkgs; xcbutilimage = libxcb-image; xcbutilkeysyms = libxcb-keysyms; xcbutilrenderutil = libxcb-render-util; - xcbutilwm = libxcb-wm; zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};