buildEnv: Support nativeBuildInputs
too
Since #112276, we should always put `makeWrapper` in `nativeBuildInputs`. But `buildEnv` was saying put it in `buildInputs`. That's wrong! Fix the instructions, and make the right thing possible.
This commit is contained in:
parent
ddf21160e3
commit
4f6ec19dbc
|
@ -36,8 +36,9 @@ lib.makeOverridable
|
||||||
, # Shell commands to run after building the symlink tree.
|
, # Shell commands to run after building the symlink tree.
|
||||||
postBuild ? ""
|
postBuild ? ""
|
||||||
|
|
||||||
, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`.
|
# Additional inputs
|
||||||
buildInputs ? []
|
, nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`.
|
||||||
|
, buildInputs ? []
|
||||||
|
|
||||||
, passthru ? {}
|
, passthru ? {}
|
||||||
, meta ? {}
|
, meta ? {}
|
||||||
|
@ -53,7 +54,8 @@ in
|
||||||
runCommand name
|
runCommand name
|
||||||
rec {
|
rec {
|
||||||
inherit manifest ignoreCollisions checkCollisionContents passthru
|
inherit manifest ignoreCollisions checkCollisionContents passthru
|
||||||
meta pathsToLink extraPrefix postBuild buildInputs;
|
meta pathsToLink extraPrefix postBuild
|
||||||
|
nativeBuildInputs buildInputs;
|
||||||
pkgs = builtins.toJSON (map (drv: {
|
pkgs = builtins.toJSON (map (drv: {
|
||||||
paths =
|
paths =
|
||||||
# First add the usual output(s): respect if user has chosen explicitly,
|
# First add the usual output(s): respect if user has chosen explicitly,
|
||||||
|
|
Loading…
Reference in a new issue