Merge: xlibs and x11 attribute cleanup

Frequently using multiple *almost* identical attributes is bad.

pkgs/tools/misc/antimicro/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }:
+{ stdenv, cmake, pkgconfig, SDL2, qt5, xorg, fetchzip }:
 
 stdenv.mkDerivation rec {
   name = "antimicro-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst
+    cmake pkgconfig SDL2 qt5.base qt5.tools xorg.libXtst
   ];
 
   meta = with stdenv.lib; {

pkgs/tools/misc/ocz-ssd-guru/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }:
+{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }:
 
 let
   system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32";
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
 
   libPath = stdenv.lib.makeLibraryPath [
-      xlibs.libX11
-      xlibs.libxcb
+      xorg.libX11
+      xorg.libxcb
       freetype
       fontconfig
-      xlibs.libXext
-      xlibs.libXi
-      xlibs.libXrender
+      xorg.libXext
+      xorg.libXi
+      xorg.libXrender
       stdenv.cc.cc
       glibc
       mesa

pkgs/tools/misc/pipelight/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs
+{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xorg
   , gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
   }:
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f";
   };
 
-  buildInputs = [ wine_custom xlibs.libX11 gcc_multi mesa curl ];
+  buildInputs = [ wine_custom xorg.libX11 gcc_multi mesa curl ];
   propagatedbuildInputs = [ curl cabextract ];
 
   patches = [ ./pipelight.patch ];

pkgs/tools/misc/unclutter/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11}:
+{stdenv, fetchurl, xlibsWrapper}:
 
 stdenv.mkDerivation {
   name = "unclutter-8";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
   };
 
-  buildInputs = [x11];
+  buildInputs = [xlibsWrapper];
 
   installPhase = ''
     mkdir -pv "$out/bin"

pkgs/tools/misc/xclip/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, x11, libXmu, autoconf, automake, libtool }:
+{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   # The last release from 2012, 0.12, lacks '-targets'
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "autoreconf -vfi";
 
-  buildInputs = [ x11 libXmu autoconf automake libtool ];
+  buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ];
 
   meta = { 
     description = "Tool to access the X clipboard from a console application";

pkgs/tools/misc/xsel/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11}:
+{stdenv, fetchurl, xlibsWrapper}:
 
 stdenv.mkDerivation {
   name = "xsel-1.2.0";
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr";
   };
 
-  buildInputs = [x11];
+  buildInputs = [xlibsWrapper];
 }