cross: drop the gnome-user-share patch; make my crossCargo compatible with debug build type

overlays/cross.nix

@@ -91,17 +91,33 @@ let
   in (final.pkgsBuildBuild.writeShellScriptBin "cargo" ''
     targetDir=target
     isFlavored=
+    outDir=
+    profile=
 
     cargoArgs=("$@")
+    nextIsOutDir=
+    nextIsProfile=
     nextIsTargetDir=
     for arg in "''${cargoArgs[@]}"; do
-      if [[ -n "$nextIsTargetDir" ]]; then
+      if [[ -n "$nextIsOutDir" ]]; then
+        nextIsOutDir=
+        outDir="$arg"
+      elif [[ -n "$nextIsProfile" ]]; then
+        nextIsProfile=
+        profile="$arg"
+      elif [[ -n "$nextIsTargetDir" ]]; then
         nextIsTargetDir=
         targetDir="$arg"
-      elif [[ "$arg" = "--target-dir" ]]; then
-        nextIsTargetDir=1
       elif [[ "$arg" = "build" ]]; then
         isFlavored=1
+      elif [[ "$arg" = "--out-dir" ]]; then
+        nextIsOutDir=1
+      elif [[ "$arg" = "--profile" ]]; then
+        nextIsProfile=1
+      elif [[ "$arg" = "--release" ]]; then
+        profile=release
+      elif [[ "$arg" = "--target-dir" ]]; then
+        nextIsTargetDir=1
       fi
     done
 
@@ -114,8 +130,12 @@ let
       extraFlags+=(
         --target "${rustHostPlatformSpec}"
         -Z unstable-options
-        --out-dir "$targetDir"/release
       )
+      if [ -z "$outDir" ]; then
+        extraFlags+=(
+          --out-dir "$targetDir"/''${profile:-debug}
+        )
+      fi
     fi
 
     exec ${setEnv} "${lib.getExe cargo}" "$@" "''${extraFlags[@]}"
@@ -219,9 +239,9 @@ in with final; {
   };
 
   # 2025/05/01: upstreaming is unblocked
-  glycin-loaders = (prev.glycin-loaders.override {
+  glycin-loaders = prev.glycin-loaders.override {
     cargo = crossCargo;
-  });
+  };
 
   # 2025/05/16: out for PR: <https://github.com/NixOS/nixpkgs/pull/407664>
   # fixes: `pkcs11/gkm/meson.build:47:20: ERROR: Program 'glib-genmarshal' not found or not executable`

pkgs/by-name/nixpkgs-bootstrap/patches.nix

@@ -30,23 +30,19 @@ let
 in
 [
   (fetchpatch' {
+    # XXX(2025-05-17): merged into staging
     name = "libmanette: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/407662";
     hash = "sha256-wubEvz5MgMS9g4PAzy4E0pUZ30AW4AvD7ZGQeie9/Mk=";
   })
 
   (fetchpatch' {
+    # XXX(2025-05-17): merged into master
     name = "gnome-keyring: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/407664";
     hash = "sha256-mlzlu3S9UuKCqQ+50ycC00FMp587pN5iiWc4OY0VrLE=";
   })
 
-  (fetchpatch' {
-    name = "gnome-user-share: build in release mode";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/407667";
-    hash = "sha256-WACEQkmKpuliraP6RY2e30/7ta4mQpgFrLCueMB9HIo=";
-  })
-
   (fetchpatch' {
     name = "xarchiver: build with strictDeps=true";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/406599";