b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bash: Remove unnecessary explicit passing of binutils

Browse source 
`binutils` for darwin was added in (add binutils to bash build for size)[9c153e2227].

The override was added in (bash: provide a working binutils)[9e05276949].
This commit is contained in:
Artturin 2023-09-26 03:57:17 +03:00
parent 99eb0f3469
commit 6c73dc6746
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/shells/bash/5.nix
View file

@ -2,7 +2,6 @@
, stdenv
, buildPackages
, fetchurl
, binutils
, bison
, util-linux
@ -90,7 +89,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison ]
++ lib.optional withDocs texinfo
++ lib.optional stdenv.hostPlatform.isDarwin binutils;
++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools;
buildInputs = lib.optional interactive readline;

6
pkgs/top-level/all-packages.nix
View file

@ -15321,17 +15321,13 @@ with pkgs;
nix-your-shell = callPackage ../shells/nix-your-shell { };
bash = lowPrio (callPackage ../shells/bash/5.nix {
binutils = stdenv.cc.bintools;
});
bash = lowPrio (callPackage ../shells/bash/5.nix { });
# WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
bashInteractive = callPackage ../shells/bash/5.nix {
binutils = stdenv.cc.bintools;
interactive = true;
withDocs = true;
};
bashInteractiveFHS = callPackage ../shells/bash/5.nix {
binutils = stdenv.cc.bintools;
interactive = true;
withDocs = true;
forFHSEnv = true;