fix: override rustc-unwrapped (not wrapper) for symlink_file patch to actually apply

2026-03-16 14:32:36 +02:00
parent cc57704fe0
commit 4b5e5eec2d
1 changed files with 7 additions and 5 deletions
@@ -98,11 +98,13 @@
        # s390x cross-compilation. Multiple call sites use t!(symlink_file(...)).
        # Patch the symlink_file method body to remove existing dest first.
        (final: prev: {
-          rustc = prev.rustc.overrideAttrs (old: {
-            postPatch = (old.postPatch or "") + ''
-              sed -i "s|if !self.config.dry_run() { symlink_file(src.as_ref(), link.as_ref()) }|if !self.config.dry_run() { let _ = std::fs::remove_file(link.as_ref()); symlink_file(src.as_ref(), link.as_ref()) }|" src/bootstrap/src/lib.rs
-            '';
-          });
+          rustc = prev.rustc.override {
+            rustc-unwrapped = prev.rustc.unwrapped.overrideAttrs (old: {
+              postPatch = (old.postPatch or "") + ''
+                sed -i "s|if !self.config.dry_run() { symlink_file(src.as_ref(), link.as_ref()) }|if !self.config.dry_run() { let _ = std::fs::remove_file(link.as_ref()); symlink_file(src.as_ref(), link.as_ref()) }|" src/bootstrap/src/lib.rs
+              '';
+            });
+          };
        })
      ];