From 63a8461b203c8d3b567eec1c858ece3d82dc9142 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 25 May 2024 16:35:53 -0700 Subject: [PATCH] ed: 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/applications/editors/ed/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/ed/generic.nix b/pkgs/applications/editors/ed/generic.nix index 70ec6badf25e..70ffdb4c4af9 100644 --- a/pkgs/applications/editors/ed/generic.nix +++ b/pkgs/applications/editors/ed/generic.nix @@ -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"