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

Merge pull request #257358 from Artturin/bashunnecessaryexplici

Browse Source
This commit is contained in:
Artturi 2023-09-30 22:58:33 +03:00 committed by GitHub
commit b6e0319318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
@ -95,7 +94,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

@ -15331,17 +15331,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;