public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bash: provide a working binutils

Browse Source 
Why does bash need binutils at all? What's wrong with stdenv?

This avoids a broken ld wrapper, since binutils is binutils wrapped
for linux, even though it's only required on darwin.
This commit is contained in:
Andrew Childs 2020-11-19 17:25:00 +09:00
parent c696fcdacb
commit 9e05276949
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

@ -9988,15 +9988,21 @@ in
any-nix-shell = callPackage ../shells/any-nix-shell { }; any-nix-shell = callPackage ../shells/any-nix-shell { };
bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); bash = lowPrio (callPackage ../shells/bash/4.4.nix {
bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { }); binutils = stdenv.cc.bintools;
});
bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix {
binutils = stdenv.cc.bintools;
});
bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix {
binutils = stdenv.cc.bintools;
interactive = true; interactive = true;
withDocs = true; withDocs = true;
}); });
# WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
bashInteractive = callPackage ../shells/bash/4.4.nix { bashInteractive = callPackage ../shells/bash/4.4.nix {
binutils = stdenv.cc.bintools;
interactive = true; interactive = true;
withDocs = true; withDocs = true;
}; };