Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #314660 from rhelmot/freebsd-minimal3/various-shell

{ed,gzip,gawk,gnugrep}: Add bash to buildInputs

authored by John Ericson and committed by GitHub 80ff741f 982be32e

Changed files
+10 -3
pkgs
applications
editors
tools
compression
text
gawk
gnugrep
+2
pkgs/applications/editors/ed/generic.nix
··· 13 13 , stdenv 14 14 , fetchurl 15 15 , lzip 16 + , runtimeShellPackage 16 17 }: 17 18 18 19 stdenv.mkDerivation { 19 20 inherit pname version src patches; 20 21 21 22 nativeBuildInputs = [ lzip ]; 23 + buildInputs = [ runtimeShellPackage ]; 22 24 23 25 configureFlags = [ 24 26 "CC=${stdenv.cc.targetPrefix}cc"
+2
pkgs/tools/compression/gzip/default.nix
··· 2 2 , fetchurl 3 3 , makeWrapper 4 4 , xz 5 + , runtimeShellPackage 5 6 }: 6 7 7 8 # Note: this package is used for bootstrapping fetchurl, and thus ··· 22 23 23 24 enableParallelBuilding = true; 24 25 26 + buildInputs = [ runtimeShellPackage]; 25 27 nativeBuildInputs = [ xz.bin makeWrapper ]; 26 28 27 29 makeFlags = [
+4 -1
pkgs/tools/text/gawk/default.nix
··· 1 1 { lib, stdenv, fetchurl 2 + , runtimeShellPackage 2 3 # TODO: links -lsigsegv but loses the reference for some reason 3 4 , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv 4 5 , interactive ? false, readline ··· 39 40 nativeBuildInputs = [ autoreconfHook ] 40 41 ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; 41 42 42 - buildInputs = lib.optional withSigsegv libsigsegv 43 + buildInputs = [ 44 + runtimeShellPackage 45 + ] ++ lib.optional withSigsegv libsigsegv 43 46 ++ lib.optional interactive readline 44 47 ++ lib.optional stdenv.isDarwin locale; 45 48
+2 -2
pkgs/tools/text/gnugrep/default.nix
··· 1 - { lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl }: 1 + { lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl, runtimeShellPackage }: 2 2 3 3 # Note: this package is used for bootstrapping fetchurl, and thus 4 4 # cannot use fetchpatch! All mutable patches (generated by GitHub or ··· 26 26 nativeCheckInputs = [ perl glibcLocales ]; 27 27 outputs = [ "out" "info" ]; # the man pages are rather small 28 28 29 - buildInputs = [ pcre2 libiconv ]; 29 + buildInputs = [ pcre2 libiconv runtimeShellPackage ]; 30 30 31 31 # cygwin: FAIL: multibyte-white-space 32 32 # freebsd: FAIL mb-non-UTF8-performance