diff --git a/overlays/cross.nix b/overlays/cross.nix
index 9e9577a5a..98520323c 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -178,15 +178,16 @@ in with final; {
   # };
 
   # 2024/12/19: upstreaming is unblocked
+  #             out for PR: <https://github.com/NixOS/nixpkgs/pull/366638>
   # fixes: "Exec format error: './calls-scan'"
-  calls = prev.calls.overrideAttrs (upstream: {
-    # TODO: try building with mesonEmulatorHook when i upstream this
-    # nativeBuildInputs = upstream.nativeBuildInputs ++ lib.optionals (!prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform) [
-    #   mesonEmulatorHook
-    # ];
-    outputs = lib.remove "devdoc" upstream.outputs;
-    mesonFlags = lib.remove "-Dgtk_doc=true" upstream.mesonFlags;
-  });
+  # calls = prev.calls.overrideAttrs (upstream: {
+  #   # TODO: try building with mesonEmulatorHook when i upstream this
+  #   # nativeBuildInputs = upstream.nativeBuildInputs ++ lib.optionals (!prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform) [
+  #   #   mesonEmulatorHook
+  #   # ];
+  #   outputs = lib.remove "devdoc" upstream.outputs;
+  #   mesonFlags = lib.remove "-Dgtk_doc=true" upstream.mesonFlags;
+  # });
 
   # 2024/11/19: upstreaming is unblocked
   delfin = (prev.delfin.override {
@@ -323,13 +324,14 @@ in with final; {
   # });
 
   # 2024/12/19: upstreaming is unblocked
-  geary = prev.geary.overrideAttrs (upstream: {
-    buildInputs = upstream.buildInputs ++ [
-      # glib
-      appstream-glib
-      libxml2
-    ];
-  });
+  #             out for PR: <https://github.com/NixOS/nixpkgs/pull/366636>
+  # geary = prev.geary.overrideAttrs (upstream: {
+  #   buildInputs = upstream.buildInputs ++ [
+  #     # glib
+  #     appstream-glib
+  #     libxml2
+  #   ];
+  # });
 
   # 2024/12/18: upstreaming is unblocked
   glycin-loaders = (prev.glycin-loaders.override {
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 5f4e2c3f0..1c8509176 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -46,6 +46,18 @@ in
     hash = "sha256-Dur6EFuc3uqMuJyXBKKIaj2Y0jA227y8U6lK06cQ718=";
   })
 
+  (fetchpatch' {
+    name = "geary: fix cross compilation";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/366636";
+    hash = "sha256-lOGkarUaWBFl3wL3S0mtS6tvVaSFC7noRwboOLYlhkA=";
+  })
+
+  (fetchpatch' {
+    name = "calls: fix cross compilation";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/366638";
+    hash = "sha256-/DkyiGGTfi9Zr96L8QjAHXOjrOMH3Gc3KlT/5GbHvlU=";
+  })
+
   (fetchpatch' {
     name = "nixos/bonsaid: init";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/347818";