diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-03-02 22:33:53 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-03-02 22:34:54 +0000 |
| commit | 4f6ec19dbc322d7ce8df9108b76e0db79682353e (patch) | |
| tree | 793e7f8e53c9d576dcf1e89e2d409c2f9f1a0cbf /pkgs/build-support | |
| parent | ddf21160e30fbd75c344a8939cc6d518f88409a1 (diff) | |
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.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/buildenv/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 7f2427777f92..5fafc36273a0 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -36,8 +36,9 @@ lib.makeOverridable , # Shell commands to run after building the symlink tree. postBuild ? "" -, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`. - buildInputs ? [] +# Additional inputs +, nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`. +, buildInputs ? [] , passthru ? {} , meta ? {} @@ -53,7 +54,8 @@ in runCommand name rec { inherit manifest ignoreCollisions checkCollisionContents passthru - meta pathsToLink extraPrefix postBuild buildInputs; + meta pathsToLink extraPrefix postBuild + nativeBuildInputs buildInputs; pkgs = builtins.toJSON (map (drv: { paths = # First add the usual output(s): respect if user has chosen explicitly, |