summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-04-05 04:05:02 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-04-05 04:05:02 +0200
commitbf1914e12aa6fac902ef4068eb6fd6d2039b410b (patch)
tree10006a6bde58c6e354a8c80ae3f3fab3e6b89963 /pkgs/stdenv
parent17eb9da14b1d6539e1080d2b9464f8cb55f9180e (diff)
parent120925b5cb82054b2a95bc153ca6959ea8619e10 (diff)
downloadnixpkgs-bf1914e12aa6fac902ef4068eb6fd6d2039b410b.tar
nixpkgs-bf1914e12aa6fac902ef4068eb6fd6d2039b410b.tar.gz
nixpkgs-bf1914e12aa6fac902ef4068eb6fd6d2039b410b.tar.bz2
nixpkgs-bf1914e12aa6fac902ef4068eb6fd6d2039b410b.tar.lz
nixpkgs-bf1914e12aa6fac902ef4068eb6fd6d2039b410b.tar.xz
nixpkgs-bf1914e12aa6fac902ef4068eb6fd6d2039b410b.tar.zst
nixpkgs-bf1914e12aa6fac902ef4068eb6fd6d2039b410b.zip
Merge remote-tracking branch 'origin/staging-next' into staging
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 6384107ec47..2263341b23f 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -74,6 +74,9 @@ in with pkgs; rec {
         cp -d ${libc.out}/lib/libresolv*.so* $out/lib
         cp -d ${libc.out}/lib/crt?.o $out/lib
 
+        # Hacky compat with our current unpack-bootstrap-tools.sh
+        ln -s librt.so "$out"/lib/librt-dummy.so
+
         cp -rL ${libc.dev}/include $out
         chmod -R u+w "$out"