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

+14 -14
+1 -2
pkgs/development/haskell-modules/with-packages-wrapper.nix
··· 57 57 # as a dedicated drv attribute, like `compiler-name` 58 58 name = ghc.name + "-with-packages"; 59 59 paths = paths ++ [ghc]; 60 + nativeBuildInputs = [ makeWrapper ]; 60 61 postBuild = '' 61 - . ${makeWrapper}/nix-support/setup-hook 62 - 63 62 # wrap compiler executables with correct env variables 64 63 65 64 for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
+2 -5
pkgs/development/interpreters/octave/build-env.nix
··· 20 20 inherit ignoreCollisions; 21 21 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; 22 22 23 - buildInputs = [ makeWrapper texinfo wrapOctave ]; 23 + nativeBuildInputs = [ makeWrapper ]; 24 + buildInputs = [ texinfo wrapOctave ]; 24 25 25 26 # During "build" we must first unlink the /share symlink to octave's /share 26 27 # Then, we can re-symlink the all of octave/share, except for /share/octave 27 28 # in env/share/octave, re-symlink everything from octave/share/octave and then 28 29 # perform the pkg install. 29 30 postBuild = '' 30 - . "${makeWrapper}/nix-support/setup-hook" 31 - # The `makeWrapper` used here is the one defined in 32 - # ${makeWrapper}/nix-support/setup-hook 33 - 34 31 if [ -L "$out/bin" ]; then 35 32 unlink $out/bin 36 33 mkdir -p "$out/bin"
+2 -3
pkgs/development/interpreters/perl/wrapper.nix
··· 17 17 inherit ignoreCollisions; 18 18 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; 19 19 20 + nativeBuildInputs = [ makeWrapper ]; 21 + 20 22 # we create wrapper for the binaries in the different packages 21 23 postBuild = '' 22 - 23 - . "${makeWrapper}/nix-support/setup-hook" 24 - 25 24 if [ -L "$out/bin" ]; then 26 25 unlink "$out/bin" 27 26 fi
+9 -4
pkgs/development/interpreters/python/wrapper.nix
··· 1 - { lib, stdenv, python, buildEnv, makeWrapper 1 + { lib, stdenv, buildEnv, makeWrapper 2 + 3 + # manually pased 4 + , python 5 + , requiredPythonModules 6 + 7 + # extra opts 2 8 , extraLibs ? [] 3 9 , extraOutputsToInstall ? [] 4 10 , postBuild ? "" 5 11 , ignoreCollisions ? false 6 12 , permitUserSite ? false 7 - , requiredPythonModules 8 13 # Wrap executables with the given argument. 9 14 , makeWrapperArgs ? [] 10 15 , }: ··· 22 27 inherit ignoreCollisions; 23 28 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; 24 29 25 - postBuild = '' 26 - . "${makeWrapper}/nix-support/setup-hook" 30 + nativeBuildInputs = [ makeWrapper ]; 27 31 32 + postBuild = '' 28 33 if [ -L "$out/bin" ]; then 29 34 unlink "$out/bin" 30 35 fi