From be0a824971392d38ceba9f871f4922f04e8e332f Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 25 May 2024 16:36:49 -0700 Subject: [PATCH] gzip: Add runtimeShell to buildInputs This package distributes shell scripts in /bin. Its shebangs are always patched to a /nix/store shell, but by default, they are patched to use the stdenv's shell, which during bootstrap is build in the previous stdenv. By using runtimeShell from the current stdenv, we can shorten the FreeBSD bootstrap process significantly. --- pkgs/tools/compression/gzip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index baff7f030387..56803742d605 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -2,6 +2,7 @@ , fetchurl , makeWrapper , xz +, runtimeShellPackage }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + buildInputs = [ runtimeShellPackage]; nativeBuildInputs = [ xz.bin makeWrapper ]; makeFlags = [