xlibs: replace occurrences by xorg

This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.

pkgs/desktops/enlightenment/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xlibs, dbus, imlib2, freetype }:
+{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }:
 
 let version = "0.16.8.15"; in
   stdenv.mkDerivation {
@@ -10,7 +10,7 @@ let version = "0.16.8.15"; in
     };
 
     buildInputs = [pkgconfig imlib2 freetype 
-      xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft ];
+      xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ];
 
     meta = {
       description = "Desktop shell built on the Enlightenment Foundation Libraries";