From 7b88e7b51fef4b9c56d545222249d9b0210ffd2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Nov 2015 13:57:01 +0100
Subject: [PATCH] all-packages: drop unnecessary `inherit (xorg) foo;`

/cc #11248.
---
 pkgs/top-level/all-packages.nix | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5a71a3bd0b3..135d45324a13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3340,11 +3340,7 @@ let
 
   vnc2flv = callPackage ../tools/video/vnc2flv {};
 
-  vncrec = callPackage ../tools/video/vncrec {
-    inherit (xorg) imake libX11 xproto gccmakedep libXt
-      libXmu libXaw libXext xextproto libSM libICE libXpm
-      libXp;
-  };
+  vncrec = callPackage ../tools/video/vncrec { };
 
   vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
 
@@ -3990,8 +3986,6 @@ let
     inherit zip unzip zlib boehmgc gettext pkgconfig perl;
     inherit gtk;
     inherit (gnome) libart_lgpl;
-    inherit (xorg) libX11 libXt libSM libICE libXtst libXi libXrender
-      libXrandr xproto renderproto xextproto inputproto randrproto;
   });
 
   gnat = gnat45; # failed to make 4.6 or 4.8 build
@@ -6352,9 +6346,7 @@ let
 
   freeglut = callPackage ../development/libraries/freeglut { };
 
-  freenect = callPackage ../development/libraries/freenect {
-      inherit (xorg) libXi libXmu;
-  };
+  freenect = callPackage ../development/libraries/freenect { };
 
   freetype = callPackage ../development/libraries/freetype { };
 
@@ -9740,9 +9732,7 @@ let
 
   dietlibc = callPackage ../os-specific/linux/dietlibc { };
 
-  directvnc = callPackage ../os-specific/linux/directvnc {
-    inherit (xorg) xproto;
-  };
+  directvnc = callPackage ../os-specific/linux/directvnc { };
 
   dmraid = callPackage ../os-specific/linux/dmraid {
     devicemapper = devicemapper.override {enable_dmeventd = true;};
@@ -13563,7 +13553,6 @@ let
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
   xaos = callPackage ../applications/graphics/xaos {
-    inherit (xorg) libXt libX11 libXext xextproto xproto;
     libpng = libpng12;
   };
 
@@ -14295,9 +14284,7 @@ let
 
   xsnow = callPackage ../games/xsnow { };
 
-  xsokoban = callPackage ../games/xsokoban {
-    inherit (xorg) libX11 xproto libXpm libXt;
-  };
+  xsokoban = callPackage ../games/xsokoban { };
 
   zandronum = callPackage ../games/zandronum { };
   zandronum-server = callPackage ../games/zandronum/server.nix { };