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

using inherits in callPackage args is discouraged and doesn't splice
correctly

5 files changed, 16 insertions, 20 deletions

diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 1c1d4cfe507..e8476b0fefb 100644
--- 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 = ''
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index b0d09a5f749..71a800520ad 100644
--- 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" ];
diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix
index fef1d2de324..66c498418d9 100644
--- 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
     ;
   };
 
diff --git a/pkgs/development/libraries/wlroots/0.14.nix b/pkgs/development/libraries/wlroots/0.14.nix
index 7fe678cb624..db10e57443c 100644
--- 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
   ;
diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix
index 7648ebe5d25..117b7ebdc5d 100644
--- 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
   ;