From 6c73dc674663f21971d4aaf83cf18e906d3e57ca Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 26 Sep 2023 03:57:17 +0300 Subject: [PATCH] bash: Remove unnecessary explicit passing of `binutils` `binutils` for darwin was added in (add binutils to bash build for size)[9c153e2227d3c66c645718355b0ed381f664afa5]. The override was added in (bash: provide a working binutils)[9e05276949045b8620a0ebd7de3aa75bb6af21cc]. --- pkgs/shells/bash/5.nix | 3 +-- 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 6b126390c9f6..67abae3d2397 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 4c5d12429134..aee374bd19e3 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;