diff options
-rw-r--r-- | pkgs/shells/bash/5.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 6b126390c9f..67abae3d239 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c5d1242913..aee374bd19e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |