Skip to content

Commit

Permalink
Temp fix for oxalica#59
Browse files Browse the repository at this point in the history
  • Loading branch information
abbec committed Nov 23, 2021
1 parent 885ef5b commit d485df5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions rust-overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -241,11 +241,10 @@ let
if [[ "$i" =~ .build-id ]]; then continue; fi
if ! isELF "$i"; then continue; fi
echo "setting interpreter of $i"
if [[ -x "$i" ]]; then
# Handle executables
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-interpreter "$(cat $NIX_BINTOOLS/nix-support/dynamic-linker)" \
--set-rpath "${makeLibraryPath [ self.zlib ]}:$out/lib" \
"$i" || true
else
Expand Down

0 comments on commit d485df5

Please sign in to comment.