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

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

Browse Source 
{ed,gzip,gawk,gnugrep}: Add bash to buildInputs
This commit is contained in:
John Ericson 2024-05-27 10:24:25 -04:00 committed by GitHub
commit 80ff741fbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/ed/generic.nix
View File

@ -13,12 +13,14 @@
, stdenv , stdenv
, fetchurl , fetchurl
, lzip , lzip
, runtimeShellPackage
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version src patches; inherit pname version src patches;
nativeBuildInputs = [ lzip ]; nativeBuildInputs = [ lzip ];
buildInputs = [ runtimeShellPackage ];
configureFlags = [ configureFlags = [
"CC=${stdenv.cc.targetPrefix}cc" "CC=${stdenv.cc.targetPrefix}cc"

2
pkgs/tools/compression/gzip/default.nix
View File

@ -2,6 +2,7 @@
, fetchurl , fetchurl
, makeWrapper , makeWrapper
, xz , xz
, runtimeShellPackage
}: }:
# Note: this package is used for bootstrapping fetchurl, and thus # Note: this package is used for bootstrapping fetchurl, and thus
@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ runtimeShellPackage];
nativeBuildInputs = [ xz.bin makeWrapper ]; nativeBuildInputs = [ xz.bin makeWrapper ];
makeFlags = [ makeFlags = [

5
pkgs/tools/text/gawk/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, runtimeShellPackage
# TODO: links -lsigsegv but loses the reference for some reason # TODO: links -lsigsegv but loses the reference for some reason
, withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv
, interactive ? false, readline , interactive ? false, readline
@ -39,7 +40,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ] nativeBuildInputs = [ autoreconfHook ]
++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales;
buildInputs = lib.optional withSigsegv libsigsegv buildInputs = [
runtimeShellPackage
] ++ lib.optional withSigsegv libsigsegv
++ lib.optional interactive readline ++ lib.optional interactive readline
++ lib.optional stdenv.isDarwin locale; ++ lib.optional stdenv.isDarwin locale;

4
pkgs/tools/text/gnugrep/default.nix
View File

@ -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 # Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or # cannot use fetchpatch! All mutable patches (generated by GitHub or
@ -26,7 +26,7 @@ stdenv.mkDerivation {
nativeCheckInputs = [ perl glibcLocales ]; nativeCheckInputs = [ perl glibcLocales ];
outputs = [ "out" "info" ]; # the man pages are rather small outputs = [ "out" "info" ]; # the man pages are rather small
buildInputs = [ pcre2 libiconv ]; buildInputs = [ pcre2 libiconv runtimeShellPackage ];
# cygwin: FAIL: multibyte-white-space # cygwin: FAIL: multibyte-white-space
# freebsd: FAIL mb-non-UTF8-performance # freebsd: FAIL mb-non-UTF8-performance