diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index fa3d699b1bbb..f5a54b9c229b 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -7,7 +7,7 @@ libxcb-keysyms, libxcb-wm, libX11, - xcbutil, + libxcb-util, xcbutilxrm, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libxcb-keysyms libxcb-wm libX11 - xcbutil + libxcb-util xcbutilxrm ]; diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index a5e525375c8a..30f79ff8d5ee 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -16,7 +16,7 @@ libxcb-cursor, libxcb-keysyms, libxcb-wm, - xcbutil, + libxcb-util, xmodmap, }: @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb-cursor libxcb-keysyms libxcb-wm - xcbutil + libxcb-util ]; # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index e4da7dcb25a5..a104a4902897 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -9,7 +9,7 @@ installShellFiles, libxcb, libxcb-keysyms, - xcbutil, + libxcb-util, libxcb-wm, xcbutilxrm, libstartup_notification, @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb libxcb-keysyms - xcbutil + libxcb-util libxcb-wm xcbutilxrm libxkbcommon diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index a085b71442a1..75d471de2e3a 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -43,7 +43,7 @@ wayland, wayland-protocols, wayland-scanner, - xcbutil, + libxcb-util, libxcb-wm, xz, # Boolean flags @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { valgrind wayland wayland-protocols - xcbutil + libxcb-util libxcb-wm xz ] diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index a0380336f05c..36a29a13c4d7 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -22,7 +22,7 @@ libGL, libxcb, vst2-sdk, - xcbutil, + libxcb-util, libxkbcommon, libxcb-keysyms, libxcb-cursor, @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { zenity alsa-tools libxcb - xcbutil + libxcb-util libxkbcommon libxcb-keysyms libxcb-cursor diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix index 7d037a93aaf9..1825c41d476c 100644 --- a/pkgs/by-name/bo/boinc/package.nix +++ b/pkgs/by-name/bo/boinc/package.nix @@ -15,7 +15,7 @@ libjpeg, libtool, wxGTK32, - xcbutil, + libxcb-util, sqlite, gtk3, patchelf, @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { libnotify libX11 libxcb - xcbutil + libxcb-util ]; NIX_LDFLAGS = lib.optionalString (!headless) "-lX11"; diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix index b9111a267594..c5e621f5eba4 100644 --- a/pkgs/by-name/bs/bspwm/package.nix +++ b/pkgs/by-name/bs/bspwm/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libxcb, libXinerama, - xcbutil, + libxcb-util, libxcb-keysyms, libxcb-wm, nixosTests, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb libXinerama - xcbutil + libxcb-util libxcb-keysyms libxcb-wm ]; diff --git a/pkgs/by-name/c6/c64-debugger/package.nix b/pkgs/by-name/c6/c64-debugger/package.nix index bb13dd188b3e..4ddc6309cdd7 100644 --- a/pkgs/by-name/c6/c64-debugger/package.nix +++ b/pkgs/by-name/c6/c64-debugger/package.nix @@ -9,7 +9,7 @@ libX11, pkg-config, upx, - xcbutil, + libxcb-util, }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { libGL libGLU libX11 - xcbutil + libxcb-util ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix index 1059b442642c..9e5aa61cbda2 100644 --- a/pkgs/by-name/ch/chow-centaur/package.nix +++ b/pkgs/by-name/ch/chow-centaur/package.nix @@ -8,7 +8,7 @@ libxkbcommon, libxcb-cursor, libxcb-keysyms, - xcbutil, + libxcb-util, libXrandr, libXinerama, libXcursor, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libxcb-cursor libxcb-keysyms - xcbutil + libxcb-util libXrandr libXinerama libXcursor diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix index db7e14572425..d3bc13495cc9 100644 --- a/pkgs/by-name/dk/dk/package.nix +++ b/pkgs/by-name/dk/dk/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromBitbucket, - xcbutil, + libxcb-util, libxcb-keysyms, libxcb-wm, libxcb-cursor, @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - xcbutil + libxcb-util libxcb-keysyms libxcb-wm libxcb-cursor diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix index ad84a9e10e0a..a1a0900ee3f1 100644 --- a/pkgs/by-name/li/librearp-lv2/package.nix +++ b/pkgs/by-name/li/librearp-lv2/package.nix @@ -8,7 +8,7 @@ libxkbcommon, libxcb-cursor, libxcb-keysyms, - xcbutil, + libxcb-util, libXrandr, libXinerama, libXcursor, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libxcb-cursor libxcb-keysyms - xcbutil + libxcb-util libXrandr libXinerama libXcursor diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix index 47de89d21fc9..e1bc9b01086c 100644 --- a/pkgs/by-name/li/librearp/package.nix +++ b/pkgs/by-name/li/librearp/package.nix @@ -8,7 +8,7 @@ libxkbcommon, libxcb-cursor, libxcb-keysyms, - xcbutil, + libxcb-util, libXrandr, libXinerama, libXcursor, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libxcb-cursor libxcb-keysyms - xcbutil + libxcb-util libXrandr libXinerama libXcursor diff --git a/pkgs/by-name/li/libstartup_notification/package.nix b/pkgs/by-name/li/libstartup_notification/package.nix index fd308cde106c..a1a00404d835 100644 --- a/pkgs/by-name/li/libstartup_notification/package.nix +++ b/pkgs/by-name/li/libstartup_notification/package.nix @@ -5,7 +5,7 @@ libX11, libxcb, pkg-config, - xcbutil, + libxcb-util, }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libX11 libxcb - xcbutil + libxcb-util ]; meta = { diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix index 725d0c73fd82..826d2dba15e7 100644 --- a/pkgs/by-name/lu/luastatus/package.nix +++ b/pkgs/by-name/lu/luastatus/package.nix @@ -24,7 +24,7 @@ docutils, libxcb, libX11, - xcbutil, + libxcb-util, libxcb-wm, }: @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb libX11 - xcbutil + libxcb-util libxcb-wm libXdmcp libXau diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 1add7236f4fe..c3579e63b692 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -24,7 +24,7 @@ pkg-config, stdenv, uthash, - xcbutil, + libxcb-util, libxcb-image, libxcb-render-util, xorgproto, @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { pcre2 pixman uthash - xcbutil + libxcb-util libxcb-image libxcb-render-util xorgproto diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 58e6b03bdeec..a6e8ccae4abe 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -15,7 +15,7 @@ lib, stdenv, xcbproto, - xcbutil, + libxcb-util, libxcb-cursor, libxcb-image, libxcb-render-util, @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pcre python3 xcbproto - xcbutil + libxcb-util libxcb-cursor libxcb-image libxcb-render-util diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix index 71861ca603f8..c47e3a2bef96 100644 --- a/pkgs/by-name/ro/rofi-unwrapped/package.nix +++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix @@ -24,7 +24,7 @@ wayland-scanner, which, xcb-imdkit, - xcbutil, + libxcb-util, libxcb-cursor, libxcb-keysyms, libxcb-wm, @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals x11Support [ libxcb xcb-imdkit - xcbutil + libxcb-util libxcb-cursor libxcb-keysyms libxcb-wm diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix index d72b6fc907fa..c7cb34ce513c 100644 --- a/pkgs/by-name/sp/spectrwm/package.nix +++ b/pkgs/by-name/sp/spectrwm/package.nix @@ -8,7 +8,7 @@ libXcursor, libXft, libXt, - xcbutil, + libxcb-util, libxcb-keysyms, libxcb-wm, writeShellScript, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { libXcursor libXft libXt - xcbutil + libxcb-util libxcb-keysyms libxcb-wm libbsd diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix index 056c6549dfdf..505c2755f0c4 100644 --- a/pkgs/by-name/su/surge/package.nix +++ b/pkgs/by-name/su/surge/package.nix @@ -12,7 +12,7 @@ libsndfile, libxcb, libxkbcommon, - xcbutil, + libxcb-util, libxcb-cursor, libxcb-keysyms, zenity, @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libxcb libxkbcommon - xcbutil + libxcb-util libxcb-cursor libxcb-keysyms zenity diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix index 57131509ae21..d7e9cf4abff0 100644 --- a/pkgs/by-name/sx/sxhkd/package.nix +++ b/pkgs/by-name/sx/sxhkd/package.nix @@ -5,7 +5,7 @@ fetchpatch, asciidoc, libxcb, - xcbutil, + libxcb-util, libxcb-keysyms, libxcb-wm, nixosTests, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb - xcbutil + libxcb-util libxcb-keysyms libxcb-wm ]; diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix index 0335ed4cb315..fbc7aa820fe3 100644 --- a/pkgs/by-name/uh/uhhyou-plugins/package.nix +++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix @@ -9,7 +9,7 @@ fontconfig, freetype, libxcb, - xcbutil, + libxcb-util, libxcb-cursor, libxcb-keysyms, libxkbcommon, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig freetype libxcb - xcbutil + libxcb-util libxcb-cursor libxcb-keysyms libxkbcommon diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index 277f77188c8f..3834e5e1db41 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -44,7 +44,7 @@ libXrender, libXtst, libxshmfence, - xcbutil, + libxcb-util, libxcb-image, libxcb-keysyms, libxcb-render-util, @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { libXrender libXtst libxshmfence - xcbutil + libxcb-util libxcb-image libXScrnSaver libxcb-keysyms diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index defaefc1eba7..f025c6940b10 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -19,7 +19,7 @@ vulkan-loader, wayland, wezterm, - xcbutil, + libxcb-util, libxcb-image, libxcb-keysyms, libxcb-wm, @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage rec { libxcb libxkbcommon wayland - xcbutil + libxcb-util libxcb-image libxcb-keysyms libxcb-wm # contains xcb-ewmh among others diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix index 2f20320890d2..7d06b697c4a1 100644 --- a/pkgs/by-name/wi/windowchef/package.nix +++ b/pkgs/by-name/wi/windowchef/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libxcb, libXrandr, - xcbutil, + libxcb-util, libxcb-keysyms, libxcb-wm, xcbproto, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb libXrandr - xcbutil + libxcb-util libxcb-keysyms libxcb-wm xcbproto diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix index 1d4ee12b0484..61ef453b2a11 100644 --- a/pkgs/by-name/wm/wmutils-core/package.nix +++ b/pkgs/by-name/wm/wmutils-core/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libxcb, - xcbutil, + libxcb-util, libxcb-cursor, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb - xcbutil + libxcb-util libxcb-cursor ]; diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index 3f67984d9f61..e662f887d8e2 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -30,7 +30,7 @@ pixman, pkg-config, systemd, - xcbutil, + libxcb-util, libxcb-wm, libxcb-image, xkbcomp, @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalPackages: rec { openssl pixman systemd - xcbutil + libxcb-util libxcb-wm libxcb-image xkbcomp diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix index 21bb44498918..185fbb26b8dd 100644 --- a/pkgs/by-name/xc/xcb-imdkit/package.nix +++ b/pkgs/by-name/xc/xcb-imdkit/package.nix @@ -5,7 +5,7 @@ cmake, extra-cmake-modules, uthash, - xcbutil, + libxcb-util, libxcb-keysyms, xorgproto, }: @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xcbutil + libxcb-util libxcb-keysyms ]; diff --git a/pkgs/by-name/xc/xcbutilxrm/package.nix b/pkgs/by-name/xc/xcbutilxrm/package.nix index e5a8b0694242..1474cb6389a8 100644 --- a/pkgs/by-name/xc/xcbutilxrm/package.nix +++ b/pkgs/by-name/xc/xcbutilxrm/package.nix @@ -5,7 +5,7 @@ pkg-config, m4, libxcb, - xcbutil, + libxcb-util, libX11, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = [ libxcb - xcbutil + libxcb-util libX11 ]; diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix index ba37370206b4..ac3ca72065ff 100644 --- a/pkgs/by-name/xd/xdo/package.nix +++ b/pkgs/by-name/xd/xdo/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libxcb, - xcbutil, + libxcb-util, libxcb-wm, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb libxcb-wm - xcbutil + libxcb-util ]; meta = { diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix index 081e9f9b766b..70bcb4aea66d 100644 --- a/pkgs/by-name/xf/xfe/package.nix +++ b/pkgs/by-name/xf/xfe/package.nix @@ -7,7 +7,7 @@ freetype, pkg-config, gettext, - xcbutil, + libxcb-util, gcc, intltool, file, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fox_1_6 gettext - xcbutil + libxcb-util gcc file libpng diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix index f404dfc15f31..c2e3f03afd51 100644 --- a/pkgs/by-name/xm/xmoji/package.nix +++ b/pkgs/by-name/xm/xmoji/package.nix @@ -6,7 +6,7 @@ fontconfig, harfbuzz, libpng, - xcbutil, + libxcb-util, libXcursor, libxcb-image, libxkbcommon, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { libpng libxkbcommon libxcb-cursor - xcbutil + libxcb-util libxcb-image ]; diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix index 972199367a33..dcb755548cbd 100644 --- a/pkgs/by-name/xs/xss-lock/package.nix +++ b/pkgs/by-name/xs/xss-lock/package.nix @@ -9,7 +9,7 @@ libpthreadstubs, libXau, libXdmcp, - xcbutil, + libxcb-util, nixosTests, }: @@ -40,7 +40,7 @@ stdenv.mkDerivation { libpthreadstubs libXau libXdmcp - xcbutil + libxcb-util ]; passthru.tests = { inherit (nixosTests) xss-lock; }; diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix index c6c0d007b3b6..6ef2a03e99f0 100644 --- a/pkgs/by-name/xt/xtitle/package.nix +++ b/pkgs/by-name/xt/xtitle/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libxcb, - xcbutil, + libxcb-util, libxcb-wm, git, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb git - xcbutil + libxcb-util libxcb-wm ]; diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index d91e318e557e..afa62f072a22 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -20,7 +20,7 @@ mesa-gl-headers, openssl, pixman, - xcbutil, + libxcb-util, libxcb-image, libxcb-keysyms, libxcb-render-util, @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { mesa-gl-headers openssl pixman - xcbutil + libxcb-util libxcb-image libxcb-keysyms libxcb-render-util diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix index b277975bc0ec..d7906269f86e 100644 --- a/pkgs/by-name/xw/xwallpaper/package.nix +++ b/pkgs/by-name/xw/xwallpaper/package.nix @@ -6,7 +6,7 @@ autoreconfHook, installShellFiles, pixman, - xcbutil, + libxcb-util, libxcb-image, libseccomp, libjpeg, @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ pixman libxcb-image - xcbutil + libxcb-util libseccomp libjpeg libpng diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix index 9fb56e898672..5bc7402d919b 100644 --- a/pkgs/by-name/ya/yambar/package.nix +++ b/pkgs/by-name/ya/yambar/package.nix @@ -21,7 +21,7 @@ wayland, wayland-protocols, wayland-scanner, - xcbutil, + libxcb-util, libxcb-cursor, libxcb-errors, libxcb-wm, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals x11Support [ - xcbutil + libxcb-util libxcb-cursor libxcb-errors libxcb-wm diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 7e4a9a98d4d4..8b83ec4d8c08 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -42,7 +42,7 @@ pcre2, sqlite, udev, - xcbutil, + libxcb-util, libxcb-image, libxcb-keysyms, libxcb-render-util, @@ -131,7 +131,7 @@ stdenv.mkDerivation ( libXrender libxcb libxkbcommon - xcbutil + libxcb-util libxcb-image libxcb-keysyms libxcb-render-util diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 6adf79beacd7..03b455aa67ac 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -56,7 +56,7 @@ pcre2, sqlite, udev, - xcbutil, + libxcb-util, libxcb-image, libxcb-keysyms, libxcb-render-util, @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { libXrender libxcb libxkbcommon - xcbutil + libxcb-util libxcb-image libxcb-keysyms libxcb-render-util diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 3c63a8ace6fc..007fe6c050f4 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -22,7 +22,7 @@ libxml2_13, ncurses, wayland, - xcbutil, + libxcb-util, zlib, zstd, }: @@ -63,7 +63,7 @@ stdenv.mkDerivation { libxml2_13 ncurses wayland - xcbutil + libxcb-util zlib zstd ]; diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index c66a7f080916..9eb8b05a05fa 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -29,7 +29,7 @@ libthai, libdatrie, libxcb-keysyms, - xcbutil, + libxcb-util, libxcb-wm, xcb-imdkit, libxkbfile, @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { libsepol libXdmcp libxkbcommon - xcbutil + libxcb-util libxcb-wm libxcb-keysyms xcb-imdkit diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index de7f9eb12531..b34a4189c2ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1908,6 +1908,7 @@ mapAliases { xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 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 + xcbutil = libxcb-util; # Added 2026-02-04 xcbutilcursor = libxcb-cursor; # Added 2026-02-04 xcbutilerrors = libxcb-errors; # Added 2026-02-04 xcbutilimage = libxcb-image; # Added 2026-02-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a87ff1841d..c3884b5b1597 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8855,7 +8855,6 @@ with pkgs; libXxf86vm = libxxf86vm; mkfontdir = mkfontscale; xcbproto = xcb-proto; - xcbutil = libxcb-util; zabbixFor = version: rec { agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};