diff --git a/overlays/preferences.nix b/overlays/preferences.nix
index 298f8e7b0..d3d343086 100644
--- a/overlays/preferences.nix
+++ b/overlays/preferences.nix
@@ -32,10 +32,10 @@
   #   #   PW uses ffmpeg-headless; not affected by `ffmpeg.override`. it directly calls into `libmysofa`
   #   withMysofa = true;
   # };
-  ffmpeg-full = super.ffmpeg-full.override {
-    # saves 20 minutes of build time and cross issues, for unused feature
-    withSamba = false;
-  };
+  # ffmpeg-full = super.ffmpeg-full.override {
+  #   # saves 20 minutes of build time and cross issues, for unused feature
+  #   withSamba = false;
+  # };
 
   # gnome-control-center = super.gnome-control-center.override {
   #   # i build goa without the "backend", to avoid webkit_4_1.
@@ -56,10 +56,10 @@
   #   # };
   # };
 
-  gvfs = super.gvfs.override {
-    # saves 20 minutes of build time and cross issues, for unused feature
-    samba = null;
-  };
+  # gvfs = super.gvfs.override {
+  #   # saves 20 minutes of build time and cross issues, for unused feature
+  #   samba = null;
+  # };
 
   # phog = super.phog.override {
   #   # disable squeekboard because it takes 20 minutes to compile when emulated
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 3819409ba..0982c81b4 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -51,6 +51,12 @@ in
     hash = "sha256-v4OUuzpB8kXIU25r20SKtASEUwz/tgxCQQ6WQL1I/N8=";
   })
 
+  (fetchpatch' {
+    name = "samba: resurrect cross compilation patch";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/357988";
+    hash = "sha256-aacdmbVGifmoWXun4ljSQ4IZZ2oxeeWRzHY56b9CoyQ=";
+  })
+
   (fetchpatch' {
     name = "nixos/bonsaid: init";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/347818";