Merge remote-tracking branch 'origin/staging-next' into staging

pkgs/development/interpreters/python/conda/default.nix

@@ -5,25 +5,24 @@
   # When installing a conda binary package, just extend
   # the `buildInputs` with `condaAutopatchLibs`.
   condaPatchelfLibs = map (p: p.lib or p) (
+    with pkgs;
     [
-      pkgs.alsa-lib
-      pkgs.cups
-      pkgs.gcc-unwrapped
-      pkgs.libGL
+      alsa-lib
+      cups
+      gcc-unwrapped
+      libGL
+      libsm
+      libice
+      libx11
+      libxau
+      libxdamage
+      libxi
+      libxrender
+      libxrandr
+      libxcomposite
+      libxcursor
+      libxtst
+      libxscrnsaver
     ]
-    ++ (with pkgs.xorg; [
-      libSM
-      libICE
-      libX11
-      libXau
-      libXdamage
-      libXi
-      libXrender
-      libXrandr
-      libXcomposite
-      libXcursor
-      libXtst
-      libXScrnSaver
-    ])
   );
 }

pkgs/development/interpreters/python/manylinux/default.nix

@@ -54,11 +54,11 @@ let
       "libutil.so.1" = glibc;
       "libpthread.so.0" = glibc;
       "libresolv.so.2" = glibc;
-      "libX11.so.6" = xorg.libX11;
-      "libXext.so.6" = xorg.libXext;
-      "libXrender.so.1" = xorg.libXrender;
-      "libICE.so.6" = xorg.libICE;
-      "libSM.so.6" = xorg.libSM;
+      "libX11.so.6" = libx11;
+      "libXext.so.6" = libxext;
+      "libXrender.so.1" = libxrender;
+      "libICE.so.6" = libice;
+      "libSM.so.6" = libsm;
       "libGL.so.1" = libGL;
       "libgobject-2.0.so.0" = glib;
       "libgthread-2.0.so.0" = glib;