Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
May 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63a8461
ed: Add runtimeShell to buildInputs
rhelmot May 25, 2024
be0a824
gzip: Add runtimeShell to buildInputs
rhelmot May 25, 2024
fa8c2ac
gawk: Add runtimeShell to buildInputs
rhelmot May 25, 2024
125d947
gnugrep: Add runtimeShell to buildInputs
rhelmot May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/applications/editors/ed/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
, stdenv
, fetchurl
, lzip
, runtimeShellPackage
}:

stdenv.mkDerivation {
inherit pname version src patches;

nativeBuildInputs = [ lzip ];
buildInputs = [ runtimeShellPackage ];

configureFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
Expand Down
2 changes: 2 additions & 0 deletions pkgs/tools/compression/gzip/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, fetchurl
, makeWrapper
, xz
, runtimeShellPackage
}:

# Note: this package is used for bootstrapping fetchurl, and thus
Expand All @@ -22,6 +23,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

buildInputs = [ runtimeShellPackage];
nativeBuildInputs = [ xz.bin makeWrapper ];

makeFlags = [
Expand Down
5 changes: 4 additions & 1 deletion pkgs/tools/text/gawk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl
, runtimeShellPackage
# TODO: links -lsigsegv but loses the reference for some reason
, withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv
, interactive ? false, readline
Expand Down Expand Up @@ -39,7 +40,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]
++ lib.optional (doCheck && stdenv.isLinux) glibcLocales;

buildInputs = lib.optional withSigsegv libsigsegv
buildInputs = [
runtimeShellPackage
] ++ lib.optional withSigsegv libsigsegv
++ lib.optional interactive readline
++ lib.optional stdenv.isDarwin locale;

Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/text/gnugrep/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl }:
{ lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl, runtimeShellPackage }:

# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
Expand Down Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation {
nativeCheckInputs = [ perl glibcLocales ];
outputs = [ "out" "info" ]; # the man pages are rather small

buildInputs = [ pcre2 libiconv ];
buildInputs = [ pcre2 libiconv runtimeShellPackage ];

# cygwin: FAIL: multibyte-white-space
# freebsd: FAIL mb-non-UTF8-performance
Expand Down