diff options
| author | John Ericson <git@JohnEricson.me> | 2021-03-02 19:46:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 19:46:10 -0500 |
| commit | d39fafe40933de071535f28084b8503bfa9204b8 (patch) | |
| tree | 29f0de8ed2f18deb058636371550539f2b1ca810 /pkgs/build-support | |
| parent | eef2c4e401446a0c95a3b6a5ae4d1a87258d565d (diff) | |
| parent | 07ecf87693fec1032c19ba1f5b41dc9cf260abb2 (diff) | |
Merge pull request #114902 from obsidiansystems/fix-tools-withPackages
treewide: Fix various tools wrappers "with packages"
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, |