diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index 03d9d49d30b1..335c5eeb82a1 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -7,7 +7,7 @@ glfw, libvgm, libx11, - libXau, + libxau, libXdmcp, cppunit, }: @@ -56,7 +56,7 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 - libXau + libxau libXdmcp ]; diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix index 09fa4c71998d..64296db0c33d 100644 --- a/pkgs/applications/display-managers/sddm/unwrapped.nix +++ b/pkgs/applications/display-managers/sddm/unwrapped.nix @@ -7,7 +7,7 @@ pkg-config, qttools, libxcb, - libXau, + libxau, pam, qtbase, qtdeclarative, @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb - libXau + libxau pam qtbase qtdeclarative diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index b2306e8966ea..6c782ae019b9 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -22,7 +22,7 @@ libXpm, libXt, libXaw, - libXau, + libxau, libXmu, libsodium, libice, @@ -184,7 +184,7 @@ stdenv.mkDerivation { libXpm libXt libXaw - libXau + libxau libXmu ] ++ lib.optional (guiSupport == "gtk2") gtk2-x11 diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 644aa457acba..25a39b95fed5 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -18,7 +18,7 @@ pixman, libpthread-stubs, gtkmm3, - libXau, + libxau, libXdmcp, lcms2, libiptcdata, @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { pixman libpthread-stubs gtkmm3 - libXau + libxau libXdmcp lcms2 libiptcdata diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 94d29865da20..871e13c15b50 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -10,7 +10,7 @@ obs-studio, libffi, libx11, - libXau, + libxau, libXdmcp, libxcb, vulkan-headers, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libffi libx11 - libXau + libxau libXdmcp libxcb vulkan-headers diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 90dab643b15d..1fd59dfcbef9 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -9,7 +9,7 @@ freetype, gettext, libx11, - libXau, + libxau, libXdmcp, libXext, libXft, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { fontconfig freetype libx11 - libXau + libxau libXdmcp libXext libXft diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index c2d8f44c0e8b..60bddc6b74d7 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -14,7 +14,7 @@ leptonica, libGL, libx11, - libXau, + libxau, libXcomposite, libXdmcp, libXfixes, @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { leptonica libGL libx11 - libXau + libxau libXcomposite libXdmcp libXfixes diff --git a/pkgs/by-name/ar/argyllcms/package.nix b/pkgs/by-name/ar/argyllcms/package.nix index db57166f1356..9cb572b3190b 100644 --- a/pkgs/by-name/ar/argyllcms/package.nix +++ b/pkgs/by-name/ar/argyllcms/package.nix @@ -15,7 +15,7 @@ libXScrnSaver, writeText, libXdmcp, - libXau, + libxau, lib, openssl, buildPackages, @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { libXrender libXScrnSaver libXdmcp - libXau + libxau openssl ]; diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 72ab394c00dc..7df07a292a7f 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -17,7 +17,7 @@ pixman, libpthread-stubs, gtkmm3, - libXau, + libxau, libXdmcp, lcms2, libraw, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { pixman libpthread-stubs gtkmm3 - libXau + libxau libXdmcp lcms2 libraw diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix index ac07c2a27237..708d93756e7c 100644 --- a/pkgs/by-name/fr/fricas/package.nix +++ b/pkgs/by-name/fr/fricas/package.nix @@ -8,7 +8,7 @@ libice, libsm, libXt, - libXau, + libxau, libXdmcp, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { libice libsm libXt - libXau + libxau libXdmcp ]; diff --git a/pkgs/by-name/in/intel-media-sdk/package.nix b/pkgs/by-name/in/intel-media-sdk/package.nix index b189fe9143f0..d1e20d59cc56 100644 --- a/pkgs/by-name/in/intel-media-sdk/package.nix +++ b/pkgs/by-name/in/intel-media-sdk/package.nix @@ -9,7 +9,7 @@ libpciaccess, libva, libx11, - libXau, + libxau, libXdmcp, libpthread-stubs, fetchpatch, @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libva libpciaccess libx11 - libXau + libxau libXdmcp libpthread-stubs ]; diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix index b58a54f0e8e0..adb082d8edb9 100644 --- a/pkgs/by-name/li/libclipboard/package.nix +++ b/pkgs/by-name/li/libclipboard/package.nix @@ -4,7 +4,7 @@ cmake, pkg-config, libxcb, - libXau, + libxau, libXdmcp, lib, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxcb - libXau + libxau libXdmcp ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix index de3f11777d26..443f6c46a877 100644 --- a/pkgs/by-name/li/libvdpau-va-gl/package.nix +++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix @@ -6,7 +6,7 @@ pkg-config, libx11, libpthread-stubs, - libXau, + libxau, libXdmcp, libXext, libvdpau, @@ -34,7 +34,7 @@ stdenv.mkDerivation { buildInputs = [ libx11 libpthread-stubs - libXau + libxau libXdmcp libXext libvdpau diff --git a/pkgs/by-name/li/links2/package.nix b/pkgs/by-name/li/links2/package.nix index 0012a1a60937..bbaa62fd4b79 100644 --- a/pkgs/by-name/li/links2/package.nix +++ b/pkgs/by-name/li/links2/package.nix @@ -20,7 +20,7 @@ enableX11 ? (!stdenv.hostPlatform.isDarwin), libx11, libXt, - libXau, # GUI support + libxau, # GUI support }: stdenv.mkDerivation (finalAttrs: { @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ] ++ lib.optionals enableX11 [ libx11 - libXau + libxau libXt ] ++ lib.optionals enableDirectFB [ directfb ]; diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 8ae41a2c0c0d..b28058e76703 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -18,7 +18,7 @@ glm, gmp, kissfftFloat, - libXau, + libxau, libXdmcp, libXpm, libXrandr, @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { glm gmp kissfftFloat - libXau + libxau libXdmcp libXpm libXrandr diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix index 91c639135370..ab549472e20d 100644 --- a/pkgs/by-name/lu/luastatus/package.nix +++ b/pkgs/by-name/lu/luastatus/package.nix @@ -13,7 +13,7 @@ glib, libnl, udev, - libXau, + libxau, libXdmcp, pcre2, pcre, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb-util libxcb-wm libXdmcp - libXau + libxau libpulseaudio libnl libselinux diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index c6485a846c2b..09cd685c6a69 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -26,7 +26,7 @@ libuv, libuvc, libv4l, - libXau, + libxau, libxcb, libXdmcp, libXext, @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { libuv libuvc libv4l - libXau + libxau libxcb libXdmcp libXext diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index bd7e3ef456a8..9fb937335b9e 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -18,7 +18,7 @@ libiconv, flex, libXp, - libXau, + libxau, demoSupport ? false, }: # refer to the gentoo package @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXp - libXau + libxau ]; strictDeps = true; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 66a20fab862b..12fe3f2bfb65 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -31,7 +31,7 @@ libxcb, libXrandr, libXinerama, - libXau, + libxau, libinput, libdrm, libgbm, @@ -173,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb libXrandr libXinerama - libXau + libxau # for gdctl and gnome-service-client shebangs (python3.withPackages (pp: [ diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix index fa8cb92c9490..110aa3c1f460 100644 --- a/pkgs/by-name/mu/mutter48/package.nix +++ b/pkgs/by-name/mu/mutter48/package.nix @@ -33,7 +33,7 @@ libxcb, libXrandr, libXinerama, - libXau, + libxau, libinput, libdrm, libgbm, @@ -173,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb libXrandr libXinerama - libXau + libxau # for gdctl shebang (python3.withPackages (pp: [ diff --git a/pkgs/by-name/na/nas/package.nix b/pkgs/by-name/na/nas/package.nix index 7bdcdad85e25..65c27bd7f875 100644 --- a/pkgs/by-name/na/nas/package.nix +++ b/pkgs/by-name/na/nas/package.nix @@ -6,7 +6,7 @@ flex, gccmakedep, imake, - libXau, + libxau, libXaw, libXext, libXpm, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libXau + libxau libXaw libXext libXpm diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix index 0929d85f8aef..aeaa261b473c 100644 --- a/pkgs/by-name/op/openbox/package.nix +++ b/pkgs/by-name/op/openbox/package.nix @@ -9,7 +9,7 @@ libxml2, libXinerama, libXcursor, - libXau, + libxau, libXrandr, libice, libsm, @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libxml2 libXinerama libXcursor - libXau + libxau libXrandr libice libsm diff --git a/pkgs/by-name/pi/piglit/package.nix b/pkgs/by-name/pi/piglit/package.nix index 6c4261eb6998..9ed60149e094 100644 --- a/pkgs/by-name/pi/piglit/package.nix +++ b/pkgs/by-name/pi/piglit/package.nix @@ -19,7 +19,7 @@ wayland, wayland-protocols, wayland-scanner, - libXau, + libxau, libx11, libXrender, libxcb, @@ -47,7 +47,7 @@ stdenv.mkDerivation { libGL libGLU libglvnd - libXau + libxau libx11 libXrender libxcb diff --git a/pkgs/by-name/sl/slstatus/package.nix b/pkgs/by-name/sl/slstatus/package.nix index 7ca2cf104a94..cc2a2faf72e5 100644 --- a/pkgs/by-name/sl/slstatus/package.nix +++ b/pkgs/by-name/sl/slstatus/package.nix @@ -6,7 +6,7 @@ writeText, libx11, libxcb, - libXau, + libxau, libXdmcp, config, conf ? config.slstatus.conf or null, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 libxcb - libXau + libxau libXdmcp ] ++ extraLibs; diff --git a/pkgs/by-name/vu/vulkan-cts/package.nix b/pkgs/by-name/vu/vulkan-cts/package.nix index 3456f0e8dc42..ba53fb8ddd14 100644 --- a/pkgs/by-name/vu/vulkan-cts/package.nix +++ b/pkgs/by-name/vu/vulkan-cts/package.nix @@ -12,7 +12,7 @@ libffi, libpng, libx11, - libXau, + libxau, libXdmcp, libxcb, makeWrapper, @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { libglvnd libpng libx11 - libXau + libxau libXdmcp libxcb vulkan-headers diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix index d604caece680..841e6a093f3e 100644 --- a/pkgs/by-name/vu/vulkan-tools/package.nix +++ b/pkgs/by-name/vu/vulkan-tools/package.nix @@ -9,7 +9,7 @@ glslang, libffi, libx11, - libXau, + libxau, libxcb, libXdmcp, libXrandr, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libffi libx11 - libXau + libxau libxcb libXdmcp libXrandr diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 114d09c0138e..54fa6621ecb1 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -10,7 +10,7 @@ glslang, libffi, libx11, - libXau, + libxau, libxcb, libXdmcp, libXrandr, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 - libXau + libxau libXdmcp libXrandr libffi diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix index 3eadc883f15f..e4bf50cc8194 100644 --- a/pkgs/by-name/wl/wlay/package.nix +++ b/pkgs/by-name/wl/wlay/package.nix @@ -6,7 +6,7 @@ extra-cmake-modules, glfw3, libx11, - libXau, + libxau, libXdmcp, libepoxy, libffi, @@ -38,7 +38,7 @@ stdenv.mkDerivation { buildInputs = [ glfw3 libx11 - libXau + libxau libXdmcp libepoxy libffi diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index ec3791ad49c9..74cc0bbce65a 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -10,7 +10,7 @@ font-util, libGL, libx11, - libXau, + libxau, libXdmcp, libXfont2, libdrm, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalPackages: rec { font-util libGL libx11 - libXau + libxau libXdmcp libXfont2 libdrm diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix index 24602a98cb13..9801cdc633ef 100644 --- a/pkgs/by-name/xs/xss-lock/package.nix +++ b/pkgs/by-name/xs/xss-lock/package.nix @@ -7,7 +7,7 @@ pkg-config, glib, libpthread-stubs, - libXau, + libxau, libXdmcp, libxcb-util, nixosTests, @@ -38,7 +38,7 @@ stdenv.mkDerivation { buildInputs = [ glib libpthread-stubs - libXau + libxau libXdmcp libxcb-util ]; diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index dff26201c09d..df80cfbc9126 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -9,7 +9,7 @@ libdrm, libGL, libx11, - libXau, + libxau, libxcb, libxcvt, libxdmcp, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libdrm libGL libx11 - libXau + libxau libxcb libxcvt libxdmcp diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix index 388323de1fa7..82921f77ad79 100644 --- a/pkgs/by-name/xw/xwayland/package.nix +++ b/pkgs/by-name/xw/xwayland/package.nix @@ -12,7 +12,7 @@ libGL, libGLU, libx11, - libXau, + libxau, libXaw, libXdmcp, libXext, @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { libGL libGLU libx11 - libXau + libxau libXaw libXdmcp libXext diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index 74aeeae6921f..df15b5379b9a 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -24,7 +24,7 @@ pcre, libXdmcp, libx11, - libXau, # X11 dependencies + libxau, # X11 dependencies fetchpatch, }: @@ -80,7 +80,7 @@ mkDerivation rec { pcre libXdmcp libx11 - libXau + libxau ] ++ lib.optional gtk2Support gtk2; diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index f04e5c8134ec..7cb9b7c992bf 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -20,7 +20,7 @@ libffi, libffcall, libx11, - libXau, + libxau, libXt, libXpm, libXext, @@ -46,7 +46,7 @@ assert x11Support -> ( libx11 != null - && libXau != null + && libxau != null && libXt != null && libXpm != null && xorgproto != null @@ -87,7 +87,7 @@ stdenv.mkDerivation { ++ lib.optional ffcallAvailable libffcall ++ lib.optionals x11Support [ libx11 - libXau + libxau libXt libXpm xorgproto