Adds `libstdc++.so.6` with patchelf to fix `rust-lld`

1 files changed, 6 insertions, 1 deletions

diff --git a/rust-overlay.nix b/rust-overlay.nix
index 280da2875379..abf2816b0b41 100644
--- a/rust-overlay.nix
+++ b/rust-overlay.nix
@@ -154,7 +154,10 @@ let
                 if [[ "$i" =~ .build-id ]]; then continue; fi
                 if ! isELF "$i"; then continue; fi
                 echo "setting interpreter of $i"
-                patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" || true
+                patchelf \
+                  --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                  --add-needed ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 \
+                  "$i" || true
               done < <(find "$dir" -type f -print0)
             }
 
@@ -202,6 +205,8 @@ let
               popd
             fi
           '';
+
+          dontStrip = true;
         };
     in
       map (nameAndSrc: (installComponent nameAndSrc.name nameAndSrc.src)) namesAndSrcs;