Temp fix for oxalica#59

goodbyekansas · Nov 23, 2021 · 84e80ab · 84e80ab
1 parent 885ef5b
commit 84e80ab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/rust-overlay.nix b/rust-overlay.nix
@@ -205,7 +205,7 @@ let
 
       # Ourselves have offset -1. In order to make these offset -1 dependencies of downstream derivation,
       # they are offset 0 propagated.
-      propagatedBuildInputs =
+      propagatedNativeBuildInputs =
         optional (pname == "rustc") [ self.stdenv.cc self.buildPackages.stdenv.cc ];
       # This goes downstream packages' buildInputs.
       depsTargetTargetPropagated =
@@ -246,12 +246,12 @@ let
                 # Handle executables
                 patchelf \
                   --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                  --set-rpath "${makeLibraryPath [ self.zlib ]}:$out/lib" \
+                  --set-rpath "${makeLibraryPath [ self.zlib self.glibc ]}:$out/lib" \
                   "$i" || true
               else
                 # Handle libraries
                 patchelf \
-                  --set-rpath "${makeLibraryPath [ self.zlib ]}:$out/lib" \
+                  --set-rpath "${makeLibraryPath [ self.zlib self.glibc ]}:$out/lib" \
                   "$i" || true
               fi
             done < <(find "$dir" -type f -print0)