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

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 = ''

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";

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 = [

pkgs/by-name/cy/cypress/package.nix

@@ -12,7 +12,6 @@
   stdenv,
   udev,
   unzip,
-  xorg,
 }:
 
 let

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,

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;
     })
   ];
 

pkgs/by-name/op/opengamepadui/package.nix

@@ -17,7 +17,6 @@
   udev,
   upower,
   vulkan-loader,
-  xorg,
   withDebug ? false,
 }:
 

pkgs/by-name/pl/plplot/package.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     ];
 
   passthru = {
-    inherit (xorg) libX11;
+    libX11 = libx11;
     inherit
       enableWX
       enableXWin

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

pkgs/by-name/sr/src-cli/package.nix

@@ -3,7 +3,6 @@
   buildGoModule,
   fetchFromGitHub,
   stdenv,
-  xorg,
   testers,
   src-cli,
 }:

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;
 

pkgs/by-name/xd/xdummy/package.nix

@@ -1,7 +1,6 @@
 {
   writeText,
   writeScriptBin,
-  xorg,
   xorg-server,
   xf86-video-dummy,
   font-misc-misc,

pkgs/by-name/xp/xpra/package.nix

@@ -41,7 +41,6 @@
   libyuv,
   xauth,
   xdg-utils,
-  xorg,
   xkeyboard-config,
   xf86-video-dummy,
   libxtst,

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 = [

pkgs/by-name/xq/xquartz/system-fonts.nix

@@ -1,6 +1,5 @@
 {
   stdenv,
-  xorg,
   font-alias,
   mkfontscale,
   fontDirs,

pkgs/by-name/xr/xrdp/package.nix

@@ -17,7 +17,6 @@
   libjpeg,
   libopus,
   nasm,
-  xorg,
   xorg-server,
   libxrandr,
   libxfixes,

pkgs/by-name/xr/xrestop/package.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  xorg,
   libxres,
   libxext,
   libx11,

pkgs/by-name/zo/zoom/package.nix

@@ -6,7 +6,6 @@
   expat,
   fontconfig,
   freetype,
-  xorg,
   libxrender,
   libxext,
   libx11,

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"

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:

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

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 = [

pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix

@@ -5,7 +5,6 @@
   libusb1,
   glibc,
   libGL,
-  xorg,
   makeWrapper,
   qtx11extras,
   wrapQtAppsHook,

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;
 

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";
 

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 { };
   });

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;
     };
 

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 { };

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 =