diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 017edfe2613e..015872e3b2f7 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -5,7 +5,7 @@ fetchurl, updateAutotoolsGnuConfigScriptsHook, bison, - util-linux, + util-linuxMinimal, coreutils, libredirect, glibcLocales, @@ -49,7 +49,7 @@ lib.warnIf (withDocs != null) # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment: # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 # or you can check libc/include/sys/cdefs.h in bionic source code - ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; + ++ lib.optionals (stdenv.hostPlatform.libc == "bionic") [ "fortify" ]; outputs = [ "out" @@ -130,9 +130,9 @@ lib.warnIf (withDocs != null) updateAutotoolsGnuConfigScriptsHook bison ] - ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ stdenv.cc.bintools ]; - buildInputs = lib.optional interactive readline; + buildInputs = lib.optionals interactive [ readline ]; enableParallelBuilding = true; @@ -167,7 +167,7 @@ lib.warnIf (withDocs != null) doCheck = true; nativeCheckInputs = attrs.nativeCheckInputs or [ ] ++ [ - util-linux + util-linuxMinimal libredirect.hook glibcLocales gnused @@ -255,7 +255,7 @@ lib.warnIf (withDocs != null) }); }; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" @@ -270,8 +270,8 @@ lib.warnIf (withDocs != null) interactive use. In addition, most sh scripts can be run by Bash without modification. ''; - license = licenses.gpl3Plus; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; # https://github.com/NixOS/nixpkgs/issues/333338 badPlatforms = [ lib.systems.inspect.patterns.isMinGW ]; maintainers = with lib.maintainers; [ infinisil ];