treewide: Fix various tools wrappers "with packages"

Now that `buildEnv` is ready, always put `makeWrapper` in
`nativeBuildInputs`, rather than `buildInputs` or (worse) mucking around
with setup hooks by hand.

(C.f. #112276, which didn't catch these because the manual setup hook
sourcing is such a hack to being with!)

Fixes #114687
This commit is contained in:
John Ericson
2021-03-02 22:33:53 +00:00
parent 4f6ec19dbc
commit 07ecf87693
4 changed files with 14 additions and 14 deletions

View File

@@ -1,10 +1,15 @@
{ lib, stdenv, python, buildEnv, makeWrapper
{ lib, stdenv, buildEnv, makeWrapper
# manually pased
, python
, requiredPythonModules
# extra opts
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false
, permitUserSite ? false
, requiredPythonModules
# Wrap executables with the given argument.
, makeWrapperArgs ? []
, }:
@@ -22,9 +27,9 @@ let
inherit ignoreCollisions;
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
postBuild = ''
. "${makeWrapper}/nix-support/setup-hook"
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi