all-packages.nix: remove `inherit (*xorg) *`'s

using inherits in callPackage args is discouraged and doesn't splice correctly
2 years ago · 61c3058bcb
parent 96fa202353
commit 61c3058bcb
45 changed files with 158 additions and 243 deletions
--- a/pkgs/applications/accessibility/mousetweaks/default.nix
+++ b/pkgs/applications/accessibility/mousetweaks/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, pkg-config
 , glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook
-, libX11, libXtst, libXfixes, libXcursor
+, xorg
 }:

 stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    glib gtk3 gsettings-desktop-schemas
-    libX11 libXtst libXfixes libXcursor
+    xorg.libX11 xorg.libXtst xorg.libXfixes xorg.libXcursor
  ];

  passthru = {
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
-, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
-, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
+, dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon
+, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:

 stdenv.mkDerivation {
  pname = "lightdm-enso-os-greeter";
@ -30,15 +30,15 @@ stdenv.mkDerivation {
    pcre
    libepoxy
    libgee
-    libX11
+    xorg.libX11
    lightdm
-    libXdmcp
+    xorg.libXdmcp
    gdk-pixbuf
    clutter-gtk
    libxklavier
    at-spi2-core
    libxkbcommon
-    libpthreadstubs
+    xorg.libpthreadstubs
    librsvg
  ];

--- a/pkgs/applications/emulators/maiko/default.nix
+++ b/pkgs/applications/emulators/maiko/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libX11 }:
+{ lib, stdenv, fetchFromGitHub, cmake, xorg }:

 stdenv.mkDerivation rec {
  pname = "maiko";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM=";
  };
  nativeBuildInputs = [ cmake ];
-  buildInputs = [ libX11 ];
+  buildInputs = [ xorg.libX11 ];
  installPhase = ''
    runHook preInstall
    find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \;
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
    homepage = "https://interlisp.org/";
    license = licenses.mit;
    maintainers = with maintainers; [ ehmry ];
-    inherit (libX11.meta) platforms;
+    inherit (xorg.libX11.meta) platforms;
  };
 }
--- a/pkgs/applications/graphics/epick/default.nix
+++ b/pkgs/applications/graphics/epick/default.nix
@ -4,11 +4,7 @@
 , stdenv
 , python3
 , libGL
-, libX11
-, libXcursor
-, libXi
-, libXrandr
-, libxcb
+, xorg
 , libxkbcommon
 , AppKit
 , IOKit
@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec {

  buildInputs = lib.optionals stdenv.isLinux [
    libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libxcb
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libxcb
    libxkbcommon
  ] ++ lib.optionals stdenv.isDarwin [
    AppKit
--- a/pkgs/applications/graphics/menyoki/default.nix
+++ b/pkgs/applications/graphics/menyoki/default.nix
@ -6,8 +6,7 @@
 , stdenv
 , withSixel ? false
 , libsixel
-, libX11
-, libXrandr
+, xorg
 , AppKit
 , withSki ? true
 }:
@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optional stdenv.isLinux pkg-config;

  buildInputs = lib.optional withSixel libsixel
-    ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ]
+    ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ])
    ++ lib.optional stdenv.isDarwin AppKit;

  buildNoDefaultFeatures = !withSki;
--- a/pkgs/applications/misc/inlyne/default.nix
+++ b/pkgs/applications/misc/inlyne/default.nix
@ -4,12 +4,8 @@
 , stdenv
 , pkg-config
 , fontconfig
-, libXcursor
-, libXi
-, libXrandr
-, libxcb
+, xorg
 , libGL
-, libX11
 , openssl
 , AppKit
 , ApplicationServices
@ -42,10 +38,10 @@ rustPlatform.buildRustPackage rec {

  buildInputs = lib.optionals stdenv.isLinux [
    fontconfig
-    libXcursor
-    libXi
-    libXrandr
-    libxcb
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libxcb
    openssl
  ] ++ lib.optionals stdenv.isDarwin [
    AppKit
@ -64,7 +60,7 @@ rustPlatform.buildRustPackage rec {

  postFixup = lib.optionalString stdenv.isLinux ''
    patchelf $out/bin/inlyne \
-      --add-rpath ${lib.makeLibraryPath [ libGL libX11 ]}
+      --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
  '';

  meta = with lib; {
--- a/pkgs/applications/misc/rlaunch/default.nix
+++ b/pkgs/applications/misc/rlaunch/default.nix
@ -1,9 +1,7 @@
 { lib
 , fetchFromGitHub
 , rustPlatform
-, libX11
-, libXft
-, libXinerama
+, xorg
 }:

 rustPlatform.buildRustPackage rec {
@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec {

  # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
  postFixup = ''
-    patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch
+    patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch
  '';

  meta = with lib; {
--- a/pkgs/applications/misc/trenchbroom/default.nix
+++ b/pkgs/applications/misc/trenchbroom/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub
 , cmake, ninja, git, pandoc, pkg-config
-, libGL, libGLU, libXxf86vm, freeimage
+, libGL, libGLU, freeimage
 , catch2, fmt, glew, miniz, tinyxml-2, xorg
 , qtbase, wrapQtAppsHook
 , copyDesktopItems, makeDesktopItem
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ];
  buildInputs = [
-    libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
+    libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
    xorg.libSM
  ];
  QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
--- a/pkgs/applications/misc/xastir/default.nix
+++ b/pkgs/applications/misc/xastir/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , curl, db, libgeotiff
-, libXpm, libXt, motif, pcre
+, xorg, motif, pcre
 , perl, proj, rastermagick, shapelib
 }:

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    curl db libgeotiff
-    libXpm libXt motif pcre
+    xorg.libXpm xorg.libXt motif pcre
    perl proj rastermagick shapelib
  ];

--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@ -2,7 +2,7 @@
 # at https://www.x.org/releases/individual/.
 # That is why this expression is not inside pkgs.xorg

-{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }:
+{ lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }:

 stdenv.mkDerivation rec {
  pname = "xfontsel";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkg-config makeWrapper ];

-  buildInputs = [ libX11 libXaw ];
+  buildInputs = [ xorg.libX11 xorg.libXaw ];

  # Without this, it gets Xmu as a dependency, but without rpath entry
  NIX_LDFLAGS = "-lXmu";
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@ -11,7 +11,7 @@
 , enableSpellcheck ? true

 # Arguments to include external libraries
-, enableLibSM ? true, libSM
+, enableLibSM ? true, xorg
 , enableGnuTLS ? true, gnutls
 , enableEnchant ? enableSpellcheck, enchant
 , enableDbus ? true, dbus, dbus-glib
@ -76,7 +76,7 @@ let
    { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; }
    { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; }
    { flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; }
-    { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; }
+    { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ xorg.libSM ]; }
    { flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; }
    { flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; }
    { flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; }
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@ -16,12 +16,7 @@
 , fontconfig
 , freetype
 , libGL
-, libX11
-, libXcursor
-, libXi
-, libXrandr
-, libXxf86vm
-, libxcb
+, xorg
 , libxkbcommon
 , wayland
 , xdg-utils
@ -41,12 +36,12 @@ let
    fontconfig
    freetype
    libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXxf86vm
-    libxcb
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXxf86vm
+    xorg.libxcb
  ] ++ lib.optionals stdenv.isLinux [
    libxkbcommon
    wayland
--- a/pkgs/data/fonts/cherry/default.nix
+++ b/pkgs/data/fonts/cherry/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }:
+{ lib, stdenv, fetchFromGitHub, xorg }:

 stdenv.mkDerivation rec {
  pname = "cherry";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
  };

-  nativeBuildInputs = [ fonttosfnt mkfontdir ];
+  nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontdir ];

  buildPhase = ''
    patchShebangs make.sh
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }:
+{ lib, stdenv, fetchurl, xorg, libfaketime }:

 stdenv.mkDerivation rec {
  pname = "clearlyU";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
  };

-  nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ];
+  nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontscale libfaketime ];

  buildPhase = ''
    # convert bdf fonts to otb
--- a/pkgs/data/fonts/creep/default.nix
+++ b/pkgs/data/fonts/creep/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, libfaketime
-, fonttosfnt, mkfontscale
+, xorg
 }:

 stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
  };

-  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
+  nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];

  buildPhase = ''
    faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, unzip
-, bdftopcf, mkfontscale, fonttosfnt
+, bdftopcf, xorg
 }:

 stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
  };

  nativeBuildInputs =
-    [ unzip bdftopcf mkfontscale fonttosfnt ];
+    [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ];

  postPatch = ''
    sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/pkgs/data/fonts/envypn-font/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, libfaketime
-, fonttosfnt, mkfontscale
+, xorg
 }:

 stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
    sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
  };

-  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
+  nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];

  unpackPhase = ''
    tar -xzf $src --strip-components=1
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, fetchFromGitHub
-, mkfontscale, bdf2psf, bdftopcf
-, fonttosfnt, libfaketime
+, xorg, bdf2psf, bdftopcf
+, libfaketime
 }:

 stdenv.mkDerivation rec {
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs =
-    [ mkfontscale bdf2psf bdftopcf
-      fonttosfnt libfaketime
+    [ xorg.mkfontscale bdf2psf bdftopcf
+      xorg.fonttosfnt libfaketime
    ];

  buildPhase = ''
--- a/pkgs/data/fonts/profont/default.nix
+++ b/pkgs/data/fonts/profont/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, mkfontscale }:
+{ lib, stdenv, fetchzip, xorg }:

 stdenv.mkDerivation {
  pname = "profont";
@ -20,7 +20,7 @@ stdenv.mkDerivation {

  dontBuild = true;

-  nativeBuildInputs = [ mkfontscale ];
+  nativeBuildInputs = [ xorg.mkfontscale ];

  installPhase = ''
    mkdir -p "$out/share/fonts/misc"
--- a/pkgs/data/fonts/siji/default.nix
+++ b/pkgs/data/fonts/siji/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }:
+{ lib, stdenv, fetchFromGitHub, libfaketime, xorg }:

 stdenv.mkDerivation rec {
  name = "siji-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
  };

-  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
+  nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];

  buildPhase = ''
    # compress pcf fonts
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchurl, mkfontscale }:
+{ lib, fetchurl, xorg }:

 let
  pname = "spleen";
@ -17,7 +17,7 @@ in fetchurl {
    install -m644 fonts.alias-spleen $d/fonts.alias

    # create fonts.dir so NixOS xorg module adds to fp
-    ${mkfontscale}/bin/mkfontdir "$d"
+    ${xorg.mkfontscale}/bin/mkfontdir "$d"
  '';
  sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94=";

--- a/pkgs/data/fonts/tamsyn/default.nix
+++ b/pkgs/data/fonts/tamsyn/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fontforge, mkfontscale }:
+{ lib, stdenv, fetchurl, fontforge, xorg }:

 let
  version = "1.11";
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
    sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp";
   };

-  nativeBuildInputs = [ fontforge mkfontscale ];
+  nativeBuildInputs = [ fontforge xorg.mkfontscale ];

  unpackPhase = ''
    tar -xzf $src --strip-components=1
--- a/pkgs/data/fonts/tamzen/default.nix
+++ b/pkgs/data/fonts/tamzen/default.nix
@ -1,4 +1,4 @@
-{ fetchFromGitHub, mkfontscale, lib, stdenv }:
+{ fetchFromGitHub, xorg, lib, stdenv }:

 stdenv.mkDerivation rec {
  pname = "tamzen-font";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s";
  };

-  nativeBuildInputs = [ mkfontscale ];
+  nativeBuildInputs = [ xorg.mkfontscale ];

  installPhase = ''
    install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc"
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, python3
-, bdftopcf, mkfontscale
+, bdftopcf, xorg
 }:

 stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ];

  nativeBuildInputs =
-    [ python3 bdftopcf mkfontscale ];
+    [ python3 bdftopcf xorg.mkfontscale ];

  enableParallelBuilding = true;

--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, python3
-, bdftopcf, mkfontscale
-, libfaketime, fonttosfnt
+, bdftopcf, xorg
+, libfaketime,
 }:

 stdenv.mkDerivation rec {
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs =
-    [ python3 bdftopcf mkfontscale
-      libfaketime fonttosfnt
+    [ python3 bdftopcf xorg.mkfontscale
+      libfaketime xorg.fonttosfnt
    ];

  postPatch = ''
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, bdftopcf
-, libfaketime, fonttosfnt, mkfontscale
+, libfaketime, xorg
 }:

 stdenv.mkDerivation {
@ -24,8 +24,8 @@ stdenv.mkDerivation {
  sourceRoot = ".";

  nativeBuildInputs =
-    [ bdftopcf libfaketime fonttosfnt
-      mkfontscale
+    [ bdftopcf libfaketime xorg.fonttosfnt
+      xorg.mkfontscale
    ];

  buildPhase = ''
--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/pkgs/data/fonts/uni-vga/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, perl, kbd, bdftopcf
-, libfaketime, fonttosfnt, mkfontscale
+, libfaketime, xorg
 }:

 stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {

  nativeBuildInputs =
    [ bdftopcf libfaketime
-      fonttosfnt mkfontscale
+      xorg.fonttosfnt xorg.mkfontscale
    ] ++ lib.optionals stdenv.isLinux [ perl kbd ];

  postPatch = "patchShebangs .";
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, mkfontscale
-, libfaketime, fonttosfnt
+{ lib, stdenv, fetchurl, xorg
+, libfaketime
 }:

 stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0=";
  };

-  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
+  nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];

  dontUnpack = true;

--- a/pkgs/data/fonts/uw-ttyp0/default.nix
+++ b/pkgs/data/fonts/uw-ttyp0/default.nix
@ -1,6 +1,5 @@
 { lib, stdenv, fetchurl, perl
-, bdftopcf, bdf2psf, mkfontdir
-, fonttosfnt
+, bdftopcf, bdf2psf, xorg
 , targetsDat  ? null
 , variantsDat ? null
 }:
@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
  # remove for version >1.3
  patches = [ ./determinism.patch ];

-  nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ];
+  nativeBuildInputs = [ perl bdftopcf bdf2psf xorg.fonttosfnt xorg.mkfontdir ];

  # configure sizes, encodings and variants
  preConfigure =
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@ -10,10 +10,7 @@
 , gobject-introspection
 , grail
 , gtk3
-, libX11
-, libXext
-, libXi
-, libXtst
+, xorg
 , pango
 , xorgserver
 }:
@ -38,7 +35,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython];
  buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
-    gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
+    gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver
  ];

  patchPhase = ''
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@ -3,8 +3,7 @@
 , fetchFromGitHub
 , autoreconfHook
 , imlib2
-, libX11
-, libXext
+, xorg
 , ncurses
 , pkg-config
 , zlib
@ -32,8 +31,8 @@ stdenv.mkDerivation rec {
    zlib
    (imlib2.override { inherit x11Support; })
  ] ++ lib.optionals x11Support [
-    libX11
-    libXext
+    xorg.libX11
+    xorg.libXext
  ];

  outputs = [ "bin" "dev" "out" "man" ];
--- a/pkgs/development/libraries/plplot/default.nix
+++ b/pkgs/development/libraries/plplot/default.nix
@ -6,7 +6,7 @@
 , wxGTK32
 , Cocoa
 , enableXWin ? false
-, libX11
+, xorg
 }:

 stdenv.mkDerivation rec {
@ -22,13 +22,13 @@ stdenv.mkDerivation rec {

  buildInputs = lib.optional enableWX wxGTK32
    ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa
-    ++ lib.optional enableXWin libX11;
+    ++ lib.optional enableXWin xorg.libX11;

  passthru = {
+    inherit (xorg) libX11;
    inherit
      enableWX
      enableXWin
-      libX11
    ;
  };

--- a/pkgs/development/libraries/wlroots/0.14.nix
+++ b/pkgs/development/libraries/wlroots/0.14.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
 , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
-, libpng, ffmpeg_4, xcbutilrenderutil, seatd
+, libcap, mesa, xorg
+, libpng, ffmpeg_4, seatd

 , enableXWayland ? true, xwayland ? null
 }:
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {

  buildInputs = [
    libGL wayland wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
-    libpng ffmpeg_4 xcbutilrenderutil seatd
+    xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
+    libpng ffmpeg_4 xorg.xcbutilrenderutil seatd
  ]
    ++ lib.optional enableXWayland xwayland
  ;
--- a/pkgs/development/libraries/wlroots/0.15.nix
+++ b/pkgs/development/libraries/wlroots/0.15.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner
 , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
-, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang
+,libcap, mesa, xorg
+, libpng, ffmpeg_4, seatd, vulkan-loader, glslang
 , nixosTests

 , enableXWayland ? true, xwayland ? null
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {

  buildInputs = [
    libGL wayland wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
-    libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader
+    xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
+    libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader
  ]
    ++ lib.optional enableXWayland xwayland
  ;
--- a/pkgs/development/misc/msp430/newlib.nix
+++ b/pkgs/development/misc/msp430/newlib.nix
@ -1,4 +1,4 @@
-{ stdenvNoCC, lndir, newlib, msp430GccSupport }:
+{ stdenvNoCC, xorg, newlib, msp430GccSupport }:

 stdenvNoCC.mkDerivation {
  name = "msp430-${newlib.name}";
@ -10,9 +10,9 @@ stdenvNoCC.mkDerivation {

  buildCommand = ''
    mkdir $out
-    ${lndir}/bin/lndir -silent $newlib $out
-    ${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
-    ${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
+    ${xorg.lndir}/bin/lndir -silent $newlib $out
+    ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir}
+    ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir}
  '';

  passthru = {
--- a/pkgs/development/tools/misc/slint-lsp/default.nix
+++ b/pkgs/development/tools/misc/slint-lsp/default.nix
@ -6,11 +6,7 @@
 , cmake
 , fontconfig
 , libGL
-, libxcb
-, libX11
-, libXcursor
-, libXi
-, libXrandr
+, xorg
 , libxkbcommon
 , wayland
  # Darwin Frameworks
@ -24,7 +20,7 @@
 }:

 let
-  rpathLibs = [ fontconfig libGL libxcb libX11 libXcursor libXrandr libXi ]
+  rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ]
    ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ];
 in
 rustPlatform.buildRustPackage rec {
@ -39,7 +35,7 @@ rustPlatform.buildRustPackage rec {
  cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4=";

  nativeBuildInputs = [ cmake pkg-config fontconfig ];
-  buildInputs = rpathLibs ++ [ libxcb.dev ]
+  buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]
    ++ lib.optionals stdenv.isDarwin [
    AppKit
    CoreGraphics
--- a/pkgs/development/tools/rust/cargo-ui/default.nix
+++ b/pkgs/development/tools/rust/cargo-ui/default.nix
@ -8,11 +8,7 @@
 , stdenv
 , fontconfig
 , libGL
-, libX11
-, libXcursor
-, libXi
-, libXrandr
-, libxcb
+, xorg
 }:

 rustPlatform.buildRustPackage rec {
@ -33,11 +29,11 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [
    fontconfig
    libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libxcb
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libxcb
  ];

  postInstall = lib.optionalString stdenv.isLinux ''
--- a/pkgs/games/jumpy/default.nix
+++ b/pkgs/games/jumpy/default.nix
@ -5,8 +5,7 @@
 , pkg-config
 , alsa-lib
 , libGL
-, libX11
-, libXi
+, xorg
 , udev
 , Cocoa
 , OpenGL
@ -32,8 +31,8 @@ rustPlatform.buildRustPackage rec {
  buildInputs = lib.optionals stdenv.isLinux [
    alsa-lib
    libGL
-    libX11
-    libXi
+    xorg.libX11
+    xorg.libXi
    udev
  ] ++ lib.optionals stdenv.isDarwin [
    Cocoa
--- a/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/pkgs/misc/screensavers/betterlockscreen/default.nix
@ -14,9 +14,7 @@
 , gnused
 , imagemagick
 , procps
-, xdpyinfo
-, xrandr
-, xset
+, xorg
 }:

 stdenv.mkDerivation rec {
@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
    mkdir -p $out/bin
    cp betterlockscreen $out/bin/betterlockscreen
    wrapProgram "$out/bin/betterlockscreen" \
-      --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}"
+      --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xorg.xdpyinfo xorg.xrandr xorg.xset ]}"

    runHook postInstall
  '';
--- a/pkgs/tools/X11/sx/default.nix
+++ b/pkgs/tools/X11/sx/default.nix
@ -3,8 +3,7 @@
 , coreutils
 , fetchFromGitHub
 , resholve
-, xauth
-, xorgserver
+, xorg
 }:

 resholve.mkDerivation rec {
@ -26,11 +25,11 @@ resholve.mkDerivation rec {
      interpreter = "${bash}/bin/sh";
      inputs = [
        coreutils
-        xauth
-        xorgserver
+        xorg.xauth
+        xorg.xorgserver
      ];
      execer = [
-        "cannot:${xorgserver}/bin/Xorg"
+        "cannot:${xorg.xorgserver}/bin/Xorg"
      ];
    };
  };
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ b/pkgs/tools/graphics/gromit-mpx/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
+, gtk, glib, pcre, libappindicator, libpthreadstubs, xorg
 , libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu
 , wrapGAppsHook
 }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
  buildInputs = [
    gtk glib pcre libappindicator libpthreadstubs
-    libXdmcp libxkbcommon libepoxy at-spi2-core
+    xorg.libXdmcp libxkbcommon libepoxy at-spi2-core
    dbus libdbusmenu
  ];

--- a/pkgs/tools/inputmethods/m17n-lib/otf.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, libXaw, freetype }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, xorg, freetype }:

 stdenv.mkDerivation rec {
  pname = "libotf";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkg-config autoreconfHook ];

-  buildInputs = [ libXaw freetype ];
+  buildInputs = [ xorg.libXaw freetype ];

  outputs = [ "out" "dev" ];

--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@ -9,7 +9,7 @@
 , oniguruma
 , libiconv
 , Security
-, libxcb
+, xorg
 , zlib
 }:

@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
    pkg-config
  ];

-  buildInputs = [ libgit2 oniguruma libxcb ] ++ lib.optionals stdenv.isDarwin [
+  buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [
    libiconv
    Security
    zlib
--- a/pkgs/tools/misc/wootility/default.nix
+++ b/pkgs/tools/misc/wootility/default.nix
@ -1,7 +1,7 @@
 { appimageTools
 , fetchurl
 , lib
-, libxkbfile
+, xorg
 , udev
 , wooting-udev-rules
 }:
@ -26,7 +26,7 @@ appimageTools.wrapType2 rec {
    pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([
      udev
      wooting-udev-rules
-      libxkbfile
+      xorg.libxkbfile
    ]);
  extraInstallCommands = "mv $out/bin/{${name},${pname}}";

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1558,9 +1558,7 @@ with pkgs;

  libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };

-  maiko = callPackage ../applications/emulators/maiko {
-    inherit (xorg) libX11;
-  };
+  maiko = callPackage ../applications/emulators/maiko { };

  mame = libsForQt514.callPackage ../applications/emulators/mame {
    inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
@ -1815,7 +1813,6 @@ with pkgs;
  ### APPLICATIONS/TERMINAL-EMULATORS

  alacritty = callPackage ../applications/terminal-emulators/alacritty {
-    inherit (xorg) libXcursor libXxf86vm libXi;
    inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
  };

@ -3178,7 +3175,6 @@ with pkgs;

  broot = callPackage ../tools/misc/broot {
    inherit (darwin.apple_sdk.frameworks) Security;
-    inherit (xorg) libxcb;
  };

  bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
@ -4485,9 +4481,7 @@ with pkgs;

  morsel = callPackage ../tools/text/morsel {};

-  mousetweaks = callPackage ../applications/accessibility/mousetweaks {
-    inherit (xorg) libX11 libXtst libXfixes;
-  };
+  mousetweaks = callPackage ../applications/accessibility/mousetweaks { };

  mp3blaster = callPackage ../applications/audio/mp3blaster { };

@ -5338,9 +5332,7 @@ with pkgs;

  m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };

-  libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix {
-    inherit (xorg) libXaw;
-  };
+  libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { };

  netbird = callPackage ../tools/networking/netbird {
    inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit;
@ -7349,7 +7341,6 @@ with pkgs;
  gromit-mpx = callPackage ../tools/graphics/gromit-mpx {
    gtk = gtk3;
    libappindicator = libappindicator-gtk3;
-    inherit (xorg) libXdmcp;
  };

  gron = callPackage ../development/tools/gron { };
@ -7503,7 +7494,6 @@ with pkgs;
  pixz = callPackage ../tools/compression/pixz { };

  plplot = callPackage ../development/libraries/plplot {
-    inherit (xorg) libX11;
    inherit (darwin.apple_sdk.frameworks) Cocoa;
  };

@ -11635,9 +11625,7 @@ with pkgs;

  squeekboard = callPackage ../applications/accessibility/squeekboard { };

-  sx = callPackage ../tools/X11/sx {
-    inherit (xorg) xauth xorgserver;
-  };
+  sx = callPackage ../tools/X11/sx { };

  systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { };

@ -11994,9 +11982,7 @@ with pkgs;

  trdl-client = callPackage ../tools/misc/trdl-client { };

-  trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom {
-    inherit (xorg) libXxf86vm;
-  };
+  trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { };

  trickle = callPackage ../tools/networking/trickle {};

@ -12422,9 +12408,7 @@ with pkgs;

  woof = callPackage ../tools/misc/woof { };

-  wootility = callPackage ../tools/misc/wootility {
-    inherit (xorg) libxkbfile;
-  };
+  wootility = callPackage ../tools/misc/wootility { };

  wormhole-william = callPackage ../tools/networking/wormhole-william { };

@ -14871,7 +14855,6 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
  };
  cargo-ui = callPackage ../development/tools/rust/cargo-ui {
-    inherit (xorg) libX11 libXcursor libXi libXrandr libxcb;
    inherit (darwin.apple_sdk.frameworks);
  };

@ -15860,7 +15843,6 @@ with pkgs;

  msp430Newlib      = callPackage ../development/misc/msp430/newlib.nix { };
  msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix {
-    inherit (buildPackages.xorg) lndir;
    newlib = newlibCross;
  };

@ -16723,9 +16705,7 @@ with pkgs;

  flexcpp = callPackage ../development/tools/parsing/flexc++ { };

-  geis = callPackage ../development/libraries/geis {
-    inherit (xorg) libX11 libXext libXi libXtst;
-  };
+  geis = callPackage ../development/libraries/geis { };

  gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };

@ -17442,7 +17422,6 @@ with pkgs;
  slimerjs = callPackage ../development/tools/slimerjs {};

  slint-lsp = callPackage ../development/tools/misc/slint-lsp {
-    inherit (xorg) libXcursor libXi;
    inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
  };

@ -19570,9 +19549,7 @@ with pkgs;

  libbytesize = callPackage ../development/libraries/libbytesize { };

-  libcaca = callPackage ../development/libraries/libcaca {
-    inherit (xorg) libX11 libXext;
-  };
+  libcaca = callPackage ../development/libraries/libcaca { };

  libcacard = callPackage ../development/libraries/libcacard { };

@ -25739,7 +25716,7 @@ with pkgs;

  changie = callPackage ../development/tools/changie { };

-  cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; };
+  cherry = callPackage ../data/fonts/cherry { };

  chonburi-font = callPackage ../data/fonts/chonburi { };

@ -25773,13 +25750,11 @@ with pkgs;

  culmus = callPackage ../data/fonts/culmus { };

-  clearlyU = callPackage ../data/fonts/clearlyU
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  clearlyU = callPackage ../data/fonts/clearlyU { };

  cm_unicode = callPackage ../data/fonts/cm-unicode {};

-  creep = callPackage ../data/fonts/creep
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  creep = callPackage ../data/fonts/creep { };

  crimson = callPackage ../data/fonts/crimson {};

@ -25791,8 +25766,7 @@ with pkgs;
    paths = [ dejavu_fonts.out ];
  };

-  dina-font = callPackage ../data/fonts/dina
-    { inherit (buildPackages.xorg) mkfontscale; };
+  dina-font = callPackage ../data/fonts/dina { };

  dns-root-data = callPackage ../data/misc/dns-root-data { };

@ -25890,8 +25864,7 @@ with pkgs;

  encode-sans = callPackage ../data/fonts/encode-sans { };

-  envypn-font = callPackage ../data/fonts/envypn-font
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  envypn-font = callPackage ../data/fonts/envypn-font { };

  execline-man-pages = skawarePackages.execline-man-pages;

@ -25937,8 +25910,7 @@ with pkgs;

  geolite-legacy = callPackage ../data/misc/geolite-legacy { };

-  gohufont = callPackage ../data/fonts/gohufont
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  gohufont = callPackage ../data/fonts/gohufont { };

  gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };

@ -26382,8 +26354,7 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security;
  };

-  profont = callPackage ../data/fonts/profont
-    { inherit (buildPackages.xorg) mkfontscale; };
+  profont = callPackage ../data/fonts/profont { };

  proggyfonts = callPackage ../data/fonts/proggyfonts { };

@ -26533,8 +26504,7 @@ with pkgs;

  scientifica = callPackage ../data/fonts/scientifica { };

-  siji = callPackage ../data/fonts/siji
-    { inherit (buildPackages.xorg) mkfontscale fonttosfnt; };
+  siji = callPackage ../data/fonts/siji { };

  sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };

@ -26553,7 +26523,7 @@ with pkgs;
  source-han-serif = sourceHanPackages.serif;
  source-han-mono = sourceHanPackages.mono;

-  spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; };
+  spleen = callPackage ../data/fonts/spleen { };

  stilo-themes = callPackage ../data/themes/stilo { };

@ -26565,9 +26535,9 @@ with pkgs;

  taskspooler = callPackage ../tools/system/taskspooler { };

-  tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; };
+  tamsyn = callPackage ../data/fonts/tamsyn { };

-  tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; };
+  tamzen = callPackage ../data/fonts/tamzen { };

  tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
    gtk = res.gtk2;
@ -26591,8 +26561,7 @@ with pkgs;

  tenderness = callPackage ../data/fonts/tenderness { };

-  terminus_font = callPackage ../data/fonts/terminus-font
-    { inherit (buildPackages.xorg) mkfontscale; };
+  terminus_font = callPackage ../data/fonts/terminus-font { };

  terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };

@ -26628,8 +26597,7 @@ with pkgs;

  ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };

-  ucs-fonts = callPackage ../data/fonts/ucs-fonts
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  ucs-fonts = callPackage ../data/fonts/ucs-fonts { };

  bront_fonts = callPackage ../data/fonts/bront { };

@ -26641,8 +26609,7 @@ with pkgs;

  unfonts-core = callPackage ../data/fonts/unfonts-core { };

-  uni-vga = callPackage ../data/fonts/uni-vga
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  uni-vga = callPackage ../data/fonts/uni-vga { };

  unicode-character-database = callPackage ../data/misc/unicode-character-database { };

@ -26650,14 +26617,13 @@ with pkgs;

  unihan-database = callPackage ../data/misc/unihan-database { };

-  unifont = callPackage ../data/fonts/unifont
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  unifont = callPackage ../data/fonts/unifont { };

  unifont_upper = callPackage ../data/fonts/unifont_upper { };

  unscii = callPackage ../data/fonts/unscii { };

-  uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { inherit (xorg) fonttosfnt mkfontdir; };
+  uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { };

  u001-font = callPackage ../data/fonts/u001 { };

@ -27325,9 +27291,7 @@ with pkgs;

  ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { };

-  claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
-    inherit (xorg) libSM;
-  };
+  claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { };

  cligh = python3Packages.callPackage ../development/tools/github/cligh {};

@ -27785,7 +27749,6 @@ with pkgs;

  epick = callPackage ../applications/graphics/epick {
    inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
-    inherit (xorg) libX11 libXcursor libXi libXrandr libxcb;
  };

  epr = callPackage ../applications/misc/epr { };
@ -28942,12 +28905,8 @@ with pkgs;
  };

  wlroots = wlroots_0_15;
-  wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix {
-    inherit (xorg) xcbutilrenderutil;
-  };
-  wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix {
-    inherit (xorg) xcbutilrenderutil;
-  };
+  wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { };
+  wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { };

  sway-unwrapped = callPackage ../applications/window-managers/sway { };
  sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
@ -28970,9 +28929,7 @@ with pkgs;

  tiramisu = callPackage ../applications/misc/tiramisu { };

-  rlaunch = callPackage ../applications/misc/rlaunch {
-    inherit (xorg) libX11 libXft libXinerama;
-  };
+  rlaunch = callPackage ../applications/misc/rlaunch { };

  rootbar = callPackage ../applications/misc/rootbar {};

@ -29032,9 +28989,7 @@ with pkgs;

  i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { };

-  betterlockscreen = callPackage ../misc/screensavers/betterlockscreen {
-    inherit (xorg) xdpyinfo xrandr xset;
-  };
+  betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { };

  multilockscreen = callPackage ../misc/screensavers/multilockscreen { };

@ -29194,7 +29149,6 @@ with pkgs;
  inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});

  inlyne = callPackage ../applications/misc/inlyne {
-    inherit (xorg) libX11 libXcursor libXi libXrandr libxcb;
    inherit (darwin) libobjc;
    inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security;
  };
@ -29879,7 +29833,6 @@ with pkgs;
  menumaker = callPackage ../applications/misc/menumaker { };

  menyoki = callPackage ../applications/graphics/menyoki {
-    inherit (xorg) libX11 libXrandr;
    inherit (darwin.apple_sdk.frameworks) AppKit;
  };

@ -31522,9 +31475,7 @@ with pkgs;

  lightdm_qt = lightdm.override { withQt5 = true; };

-  lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter {
-    inherit (xorg) libX11 libXdmcp libpthreadstubs;
-  };
+  lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { };

  lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
    inherit (xfce) xfce4-dev-tools;
@ -32625,7 +32576,6 @@ with pkgs;

  xastir = callPackage ../applications/misc/xastir {
    rastermagick = imagemagick6;
-    inherit (xorg) libXt;
  };

  xautomation = callPackage ../tools/X11/xautomation { };
@ -33701,7 +33651,6 @@ with pkgs;
  fish-fillets-ng = callPackage ../games/fish-fillets-ng { };

  jumpy = callPackage ../games/jumpy {
-    inherit (xorg) libX11 libXi;
    inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
  };

@ -36859,8 +36808,7 @@ with pkgs;

  tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };

-  tewi-font = callPackage ../data/fonts/tewi
-    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+  tewi-font = callPackage ../data/fonts/tewi { };

  texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;