Merge staging-next into staging

pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix

@@ -82,7 +82,10 @@ let result = stdenv.mkDerivation rec {
     EOF
 
     # We cannot use -exec since wrapProgram is a function but not a command.
-    for bin in $( find "$out" -executable -type f ); do
+    #
+    # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
+    # breaks building OpenJDK (#114495).
+    for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
       if patchelf --print-interpreter "$bin" &> /dev/null; then
         wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
       fi