@@ -155,23 +155,23 @@ pkgs:
155155 "webkit2gtk-4.0" = [ pkgs."webkitgtk" ];
156156 "webkit2gtk-web-extension-4.0" = [ pkgs."webkitgtk" ];
157157 "webkitgtk-3.0" = [ pkgs."webkitgtk24x-gtk3" ]; # These are the old APIs, of which 2.4 is the last provider, so map directly to that
158− "X11" = [ pkgs."libX11" ];
159− "x11" = [ pkgs."xlibsWrapper" ];
160− "xau" = [ pkgs."libXau" ];
161− "Xcursor" = [ pkgs."libXcursor" ];
158+ "X11" = [ pkgs.xorg."libX11" ];
159+ "x11" = [ pkgs.xorg."xlibsWrapper" ];
160+ "xau" = [ pkgs.xorg."libXau" ];
161+ "Xcursor" = [ pkgs.xorg."libXcursor" ];
162162 "xerces-c" = [ pkgs."xercesc" ];
163− "Xext" = [ pkgs."libXext" ];
164− "xft" = [ pkgs."libXft" ];
165− "Xi" = [ pkgs."libXi" ];
166− "Xinerama" = [ pkgs."libXinerama" ];
163+ "Xext" = [ pkgs.xorg."libXext" ];
164+ "xft" = [ pkgs.xorg."libXft" ];
165+ "Xi" = [ pkgs.xorg."libXi" ];
166+ "Xinerama" = [ pkgs.xorg."libXinerama" ];
167167 "xkbcommon" = [ pkgs."libxkbcommon" ];
168168 "xml2" = [ pkgs."libxml2" ];
169− "Xpm" = [ pkgs."libXpm" ];
170− "Xrandr" = [ pkgs."libXrandr" ];
171− "Xrender" = [ pkgs."libXrender" ];
172− "Xss" = [ pkgs."libXScrnSaver" ];
173− "Xtst" = [ pkgs."libXtst" ];
174− "Xxf86vm" = [ pkgs."libXxf86vm" ];
169+ "Xpm" = [ pkgs.xorg."libXpm" ];
170+ "Xrandr" = [ pkgs.xorg."libXrandr" ];
171+ "Xrender" = [ pkgs.xorg."libXrender" ];
172+ "Xss" = [ pkgs.xorg."libXScrnSaver" ];
173+ "Xtst" = [ pkgs.xorg."libXtst" ];
174+ "Xxf86vm" = [ pkgs.xorg."libXxf86vm" ];
175175 "yaml" = [ pkgs."libyaml" ];
176176 "yaml-0.1" = [ pkgs."libyaml" ];
177177 "z" = [ pkgs."zlib" ];