mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 13:40:28 +03:00
Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin), but we now have a 20k jobs rebuilding directly on master, so we would never get to merge this way...
This commit is contained in:
commit
422adc3063
67 changed files with 423 additions and 1538 deletions
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
for file in $out/bin/*; do
|
||||
chmod +w $file
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
|
||||
--set-rpath ${lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]} \
|
||||
$file
|
||||
done
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue