From 233631a84f93acd9bd93b144925e6d1305ce2dcd Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Fri, 23 Jan 2026 16:26:47 +0100 Subject: [PATCH] treewide: remove references to the xorg namespace in `pkgs` (manual) this was done manually, fixing the eval and any remaining stuff of the previous commit together with the previous commit this shouldn't create any rebuilds --- .../graphics/imlibsetroot/default.nix | 4 ++-- .../virtualbox/guest-additions/default.nix | 4 ++-- pkgs/by-name/ah/ahk_x11/package.nix | 21 +++++++------------ pkgs/by-name/cy/cypress/package.nix | 1 - pkgs/by-name/fe/feather-tk/package.nix | 2 +- pkgs/by-name/fx/fxlinuxprintutil/package.nix | 4 ++-- pkgs/by-name/op/opengamepadui/package.nix | 1 - pkgs/by-name/pl/plplot/package.nix | 2 +- pkgs/by-name/ru/runescape/package.nix | 7 +++---- pkgs/by-name/sr/src-cli/package.nix | 1 - pkgs/by-name/vi/vintagestory/package.nix | 1 - pkgs/by-name/xd/xdummy/package.nix | 1 - pkgs/by-name/xp/xpra/package.nix | 1 - pkgs/by-name/xq/xquartz/package.nix | 8 ++++++- pkgs/by-name/xq/xquartz/system-fonts.nix | 1 - pkgs/by-name/xr/xrdp/package.nix | 1 - pkgs/by-name/xr/xrestop/package.nix | 1 - pkgs/by-name/zo/zoom/package.nix | 1 - .../community-edition/buildGraalvm.nix | 6 +++++- pkgs/development/idris-modules/default.nix | 2 +- .../python-modules/pythonocc-core/default.nix | 16 +++++++------- .../python-modules/ueberzug/default.nix | 12 +++++------ .../xp-pen-drivers/deco-01-v2/default.nix | 1 - pkgs/tools/graphics/graphviz/default.nix | 3 ++- pkgs/tools/typesetting/tex/texlive/bin.nix | 15 +++++++------ pkgs/top-level/all-packages.nix | 10 +++------ pkgs/top-level/emacs-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 17 ++++++++------- pkgs/top-level/stage.nix | 3 +-- 29 files changed, 69 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index d8612f866964..bfc91646471d 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, libX11, - libXinerama, + libxinerama, imlib2, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 imlib2 - libXinerama + libxinerama ]; buildPhase = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ac1f1f55eba0..de7823f7966a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -15,7 +15,7 @@ patchelf, makeWrapper, wayland, - libX11, + libx11, }: let virtualboxVersion = "7.2.4"; @@ -61,7 +61,7 @@ let } { name = "libX11.so"; - pkg = libX11; + pkg = libx11; } { name = "libXt.so"; diff --git a/pkgs/by-name/ah/ahk_x11/package.nix b/pkgs/by-name/ah/ahk_x11/package.nix index d426783ec477..22ddf27dc20c 100644 --- a/pkgs/by-name/ah/ahk_x11/package.nix +++ b/pkgs/by-name/ah/ahk_x11/package.nix @@ -5,7 +5,10 @@ copyDesktopItems, gtk3, libxkbcommon, - xorg, + libxinerama, + libxtst, + libxext, + libxi, libnotify, gobject-introspection, # needed to build gi-crystal openbox, @@ -21,14 +24,6 @@ let pname = "ahk_x11"; version = "1.0.7"; - - inherit (xorg) - libXinerama - libXtst - libXext - libXi - ; - in crystal.buildCrystalPackage { inherit pname version; @@ -75,10 +70,10 @@ crystal.buildCrystalPackage { buildInputs = [ gtk3 libxkbcommon - libXinerama - libXtst - libXext - libXi + libxinerama + libxtst + libxext + libxi libnotify ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 5c1513c10155..0bc132727e15 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -12,7 +12,6 @@ stdenv, udev, unzip, - xorg, }: let diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix index 18f9da5a1124..86ca0e289908 100644 --- a/pkgs/by-name/fe/feather-tk/package.nix +++ b/pkgs/by-name/fe/feather-tk/package.nix @@ -14,7 +14,7 @@ nativefiledialog-extended, nlohmann_json, plutovg, - xvfb, + xvfb-run, zlib, python3Packages ? null, enableNFD ? true, diff --git a/pkgs/by-name/fx/fxlinuxprintutil/package.nix b/pkgs/by-name/fx/fxlinuxprintutil/package.nix index 6db57516e01d..2bc0a978e924 100644 --- a/pkgs/by-name/fx/fxlinuxprintutil/package.nix +++ b/pkgs/by-name/fx/fxlinuxprintutil/package.nix @@ -8,7 +8,7 @@ cups, tcl, tk, - xorg, + libx11, makeWrapper, }: let @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # replaces the code that looks for X11’s locale.alias in /usr/share/X11/locale or # /usr/lib/X11/locale with /nix/store/libX11/share/X11/locale (replaceVars ./fxlocalechk.tcl.patch { - inherit (xorg) libX11; + libX11 = libx11; }) ]; diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index e3311a3f7ac8..9a6a026f4aad 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -17,7 +17,6 @@ udev, upower, vulkan-loader, - xorg, withDebug ? false, }: diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix index 8282af36373f..f02b15363704 100644 --- a/pkgs/by-name/pl/plplot/package.nix +++ b/pkgs/by-name/pl/plplot/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; passthru = { - inherit (xorg) libX11; + libX11 = libx11; inherit enableWX enableXWin diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix index 9800887843ad..f45dbb9458dc 100644 --- a/pkgs/by-name/ru/runescape/package.nix +++ b/pkgs/by-name/ru/runescape/package.nix @@ -14,13 +14,12 @@ libpulseaudio, libSM, libXxf86vm, - libX11, + libx11, openssl_1_1, pango, SDL2, wrapGAppsHook3, xdg-utils, - xorg, xorg_sys_opengl, zlib, }: @@ -51,7 +50,7 @@ let gtk2-x11 libSM libXxf86vm - libX11 + libx11 openssl_1_1 pango zlib @@ -126,7 +125,7 @@ buildFHSEnv { libpulseaudio libSM libXxf86vm - libX11 + libx11 openssl_1_1 pango SDL2 diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 47bbcc9a3a69..af8b1332cef4 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, stdenv, - xorg, testers, src-cli, }: diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index 7f3b01b350db..5d71254e704e 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -26,7 +26,6 @@ }: assert x11Support || waylandSupport; -assert x11Support -> xorg != null; assert waylandSupport -> wayland != null; assert waylandSupport -> libxkbcommon != null; diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix index fd7783218ef7..2b1c85ee105f 100644 --- a/pkgs/by-name/xd/xdummy/package.nix +++ b/pkgs/by-name/xd/xdummy/package.nix @@ -1,7 +1,6 @@ { writeText, writeScriptBin, - xorg, xorg-server, xf86-video-dummy, font-misc-misc, diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index 7dbd007fbd95..0d0c56017985 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -41,7 +41,6 @@ libyuv, xauth, xdg-utils, - xorg, xkeyboard-config, xf86-video-dummy, libxtst, diff --git a/pkgs/by-name/xq/xquartz/package.nix b/pkgs/by-name/xq/xquartz/package.nix index 99098e7bdf8e..a3a33b92d458 100644 --- a/pkgs/by-name/xq/xquartz/package.nix +++ b/pkgs/by-name/xq/xquartz/package.nix @@ -8,6 +8,7 @@ xorg-server, tab-window-manager, libxpm, + font-alias, font-util, font-misc-misc, font-cursor-misc, @@ -150,7 +151,12 @@ let ]; }; fonts = import ./system-fonts.nix { - inherit stdenv xorg fontDirs; + inherit + stdenv + font-alias + mkfontscale + fontDirs + ; }; # any X related programs expected to be available via $PATH pkgs = [ diff --git a/pkgs/by-name/xq/xquartz/system-fonts.nix b/pkgs/by-name/xq/xquartz/system-fonts.nix index 11621655009d..308b44fdb5fc 100644 --- a/pkgs/by-name/xq/xquartz/system-fonts.nix +++ b/pkgs/by-name/xq/xquartz/system-fonts.nix @@ -1,6 +1,5 @@ { stdenv, - xorg, font-alias, mkfontscale, fontDirs, diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix index 9ef8c4f47f23..6009ad304576 100644 --- a/pkgs/by-name/xr/xrdp/package.nix +++ b/pkgs/by-name/xr/xrdp/package.nix @@ -17,7 +17,6 @@ libjpeg, libopus, nasm, - xorg, xorg-server, libxrandr, libxfixes, diff --git a/pkgs/by-name/xr/xrestop/package.nix b/pkgs/by-name/xr/xrestop/package.nix index f35f076b1135..b25686132946 100644 --- a/pkgs/by-name/xr/xrestop/package.nix +++ b/pkgs/by-name/xr/xrestop/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - xorg, libxres, libxext, libx11, diff --git a/pkgs/by-name/zo/zoom/package.nix b/pkgs/by-name/zo/zoom/package.nix index 156e8444665a..d121947920be 100644 --- a/pkgs/by-name/zo/zoom/package.nix +++ b/pkgs/by-name/zo/zoom/package.nix @@ -6,7 +6,6 @@ expat, fontconfig, freetype, - xorg, libxrender, libxext, libx11, diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 3f6cd0287634..d65b4775fae4 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -46,7 +46,11 @@ let "runCommandCC" "setJavaClassPath" "unzip" - "xorg" + "libxtst" + "libxrender" + "libxi" + "libxext" + "libx11" "zlib" "extraCLibs" "gtkSupport" diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index c333fa9064f1..b79ff9af9bbe 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -15,7 +15,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; }; - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; + mkScope = scope: pkgs // pkgs.gnome2 // scope; idrisPackages = self: diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 6f55eb6a5c82..93684b2441c7 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -8,10 +8,10 @@ freetype, libGL, libGLU, - libX11, - libXext, - libXi, - libXmu, + libx11, + libxext, + libxi, + libxmu, opencascade-occt, numpy, rapidjson, @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { freetype libGL libGLU - libX11 - libXext - libXmu - libXi + libx11 + libxext + libxmu + libxi fontconfig numpy rapidjson diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index 2cf48e3b9b13..71d98a4f7849 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -4,9 +4,9 @@ buildPythonPackage, docopt, fetchPypi, - libX11, - libXext, - libXres, + libx11, + libxext, + libxres, meson-python, meson, pillow, @@ -33,9 +33,9 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libXres - libXext + libx11 + libxres + libxext ]; dependencies = [ diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix index ad30afd0e1ab..7cf7075a1500 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix @@ -5,7 +5,6 @@ libusb1, glibc, libGL, - xorg, makeWrapper, qtx11extras, wrapQtAppsHook, diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 033ddda2e542..dc10e084b071 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -68,7 +68,8 @@ stdenv.mkDerivation rec { "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" ] - ++ optional (xorg == null) "--without-x"; + # TODO: this should probably be !withXorg instead of false, however it causes 17k rebuilds + ++ optional false "--without-x"; enableParallelBuilding = true; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 96f7637af334..71c598a69680 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -10,16 +10,16 @@ zlib, libiconv, libpng, - libX11, + libx11, freetype, ttfautohint, gd, - libXaw, + libxaw, icu, ghostscript, - libXpm, - libXmu, - libXext, + libxpm, + libxmu, + libxext, perl, perlPackages, python3Packages, @@ -37,7 +37,6 @@ brotli, cairo, pixman, - xorg, libxi, libxfixes, clisp, @@ -416,7 +415,7 @@ rec { harfbuzz icu graphite2 - libX11 + libx11 potrace ]; @@ -785,7 +784,7 @@ rec { inherit (common) src; - buildInputs = [ libX11 ]; + buildInputs = [ libx11 ]; preConfigure = "cd utils/xpdfopen"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5463bbff101..589a7e680b3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3766,9 +3766,7 @@ with pkgs; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; - twilight = callPackage ../tools/graphics/twilight { - libx11 = libx11; - }; + twilight = callPackage ../tools/graphics/twilight { }; twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader @@ -7004,9 +7002,7 @@ with pkgs; x11Support = false; }; - imlibsetroot = callPackage ../applications/graphics/imlibsetroot { - libxinerama = libxinerama; - }; + imlibsetroot = callPackage ../applications/graphics/imlibsetroot { }; indilib = callPackage ../development/libraries/science/astronomy/indilib { }; indi-3rdparty = recurseIntoAttrs ( @@ -9088,7 +9084,7 @@ with pkgs; xorg = recurseIntoAttrs (makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "xorg"; # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` - # so as not to have the newly bound libxcb-cursor, + # so as not to have the newly bound xorg items already in scope, which would # have created a cycle. f = lib.callPackageWith __splicedPackages ../servers/x11/xorg { }; }); diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 6055b609e506..f2d8cb4d20eb 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -66,7 +66,7 @@ let emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../applications/editors/emacs/build-support/wrapper.nix { - inherit (pkgs.xorg) lndir; + inherit (pkgs) lndir; inherit lib; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da84d3a7976f..c276d9ec0736 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12207,8 +12207,8 @@ self: super: with self; { libwebp openjpeg zlib-ng + libxcb ; - inherit (pkgs.xorg) libxcb; }; pillow-heif = callPackage ../development/python-modules/pillow-heif { }; @@ -15717,12 +15717,13 @@ self: super: with self; { pythonocc-core = toPythonModule ( callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs) fontconfig rapidjson; - inherit (pkgs.xorg) - libX11 - libXi - libXmu - libXext + inherit (pkgs) + fontconfig + rapidjson + libx11 + libxi + libxmu + libxext ; } ); @@ -20013,7 +20014,7 @@ self: super: with self; { ueagle = callPackage ../development/python-modules/ueagle { }; ueberzug = callPackage ../development/python-modules/ueberzug { - inherit (pkgs.xorg) libX11 libXext; + inherit (pkgs) libx11 libxext; }; ufal-chu-liu-edmonds = callPackage ../development/python-modules/ufal-chu-liu-edmonds { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 926a132a3805..34edecf6d968 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -134,8 +134,7 @@ let inherit lib; inherit (self) config; inherit (self) runtimeShell stdenv stdenvNoCC; - inherit (self.pkgsBuildHost) jq shellcheck-minimal; - inherit (self.pkgsBuildHost.xorg) lndir; + inherit (self.pkgsBuildHost) jq shellcheck-minimal lndir; }; stdenvBootstappingAndPlatforms =