Merge #983

983: moved xorg packages to correct attributeset r=rvl a=paumr

I'm wondering how/if this worked before, i couldn't find some xorg
packages on their previous path.
(Neither on the current version of nixpkgs nor on nixpkgs anno 2018)

Co-authored-by: paumr <[email protected]>

Author: iohk-bors[bot]

lib/pkgconf-nixpkgs-map.nix

@@ -155,23 +155,23 @@ pkgs:
     "webkit2gtk-4.0"                     = [ pkgs."webkitgtk" ];
     "webkit2gtk-web-extension-4.0"       = [ pkgs."webkitgtk" ];
     "webkitgtk-3.0"                      = [ pkgs."webkitgtk24x-gtk3" ]; # These are the old APIs, of which 2.4 is the last provider, so map directly to that
-    "X11"                                = [ pkgs."libX11" ];
-    "x11"                                = [ pkgs."xlibsWrapper" ];
-    "xau"                                = [ pkgs."libXau" ];
-    "Xcursor"                            = [ pkgs."libXcursor" ];
+    "X11"                                = [ pkgs.xorg."libX11" ];
+    "x11"                                = [ pkgs.xorg."xlibsWrapper" ];
+    "xau"                                = [ pkgs.xorg."libXau" ];
+    "Xcursor"                            = [ pkgs.xorg."libXcursor" ];
     "xerces-c"                           = [ pkgs."xercesc" ];
-    "Xext"                               = [ pkgs."libXext" ];
-    "xft"                                = [ pkgs."libXft" ];
-    "Xi"                                 = [ pkgs."libXi" ];
-    "Xinerama"                           = [ pkgs."libXinerama" ];
+    "Xext"                               = [ pkgs.xorg."libXext" ];
+    "xft"                                = [ pkgs.xorg."libXft" ];
+    "Xi"                                 = [ pkgs.xorg."libXi" ];
+    "Xinerama"                           = [ pkgs.xorg."libXinerama" ];
     "xkbcommon"                          = [ pkgs."libxkbcommon" ];
     "xml2"                               = [ pkgs."libxml2" ];
-    "Xpm"                                = [ pkgs."libXpm" ];
-    "Xrandr"                             = [ pkgs."libXrandr" ];
-    "Xrender"                            = [ pkgs."libXrender" ];
-    "Xss"                                = [ pkgs."libXScrnSaver" ];
-    "Xtst"                               = [ pkgs."libXtst" ];
-    "Xxf86vm"                            = [ pkgs."libXxf86vm" ];
+    "Xpm"                                = [ pkgs.xorg."libXpm" ];
+    "Xrandr"                             = [ pkgs.xorg."libXrandr" ];
+    "Xrender"                            = [ pkgs.xorg."libXrender" ];
+    "Xss"                                = [ pkgs.xorg."libXScrnSaver" ];
+    "Xtst"                               = [ pkgs.xorg."libXtst" ];
+    "Xxf86vm"                            = [ pkgs.xorg."libXxf86vm" ];
     "yaml"                               = [ pkgs."libyaml" ];
     "yaml-0.1"                           = [ pkgs."libyaml" ];
     "z"                                  = [ pkgs."zlib" ];