fix builder patch from mozilla#304 (comment)

fatho · Mar 11, 2023 · 89bf998 · 89bf998
1 parent 78e7239
commit 89bf998
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/rust-overlay.nix b/rust-overlay.nix
@@ -287,20 +287,20 @@ let
               for target in $out/bin/{rustc,rustdoc} $out/lib/rustlib/etc/*.py; do
                 if [ -e $target ]; then
                   cp --remove-destination "$(realpath -e $target)" $target
-                fi
 
-                # The SYSROOT is determined by using the librustc_driver-*.so.
-                # So, we need to point to the *.so files in our derivation.
-                chmod u+w $target
-                patchelf --set-rpath "$out/lib" $target || true
+                  # The SYSROOT is determined by using the librustc_driver-*.so.
+                  # So, we need to point to the *.so files in our derivation.
+                  chmod u+w $target
+                  patchelf --set-rpath "$out/lib" $target || true
+                fi
               done
 
               # Here we copy the librustc_driver-*.so to our derivation.
               # The SYSROOT is determined based on the path of this library.
-              if ls $out/lib/librustc_driver-*.so &> /dev/null; then
-                RUSTC_DRIVER_PATH=$(realpath -e $out/lib/librustc_driver-*.so)
-                rm $out/lib/librustc_driver-*.so
-                cp $RUSTC_DRIVER_PATH $out/lib/
+              if ls "$out/lib/librustc_driver-*.so" &> /dev/null; then
+                RUSTC_DRIVER_PATH="$(realpath -e "$out/lib/librustc_driver-*.so")"
+                rm "$out/lib/librustc_driver-*.so"
+                cp "$RUSTC_DRIVER_PATH" $out/lib/
               fi
             '';