bazelisk-env: fix gcc linking against nixos libc

mgit-at · Sep 15, 2024 · 8423001 · 8423001
1 parent 5e9ca04
commit 8423001
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkgs/bazelisk-env/default.nix b/pkgs/bazelisk-env/default.nix
@@ -29,7 +29,6 @@ buildFHSUserEnv {
     # crt1.o is already taken care of by buildFHSEnv.nix
     (pkgs.callPackage ./gcc_multi_patched.nix {})
 
-    binutils
     pkg-config
     python3
     coreutils-full # is not multi since takes forever to build and no cache available

diff --git a/pkgs/bazelisk-env/gcc_multi_patched.nix b/pkgs/bazelisk-env/gcc_multi_patched.nix
@@ -1,6 +1,7 @@
 {
   gcc_multi,
   stdenv,
+  bintools-unwrapped,
 }:
 
 stdenv.mkDerivation {
@@ -19,6 +20,8 @@ stdenv.mkDerivation {
     find bin -type f -exec sed -i \
       -e 's,expandResponseParams,params=("$@");true,g' \
       {} +
+    rm bin/ld
+    ln -s ${bintools-unwrapped}/bin/ld bin/ld
   '';
 
   installPhase = ''