Merge pull request #114902 from obsidiansystems/fix-tools-withPackages

treewide: Fix various tools wrappers "with packages"

pkgs/development/interpreters/octave/build-env.nix

@@ -20,17 +20,14 @@ in buildEnv {
   inherit ignoreCollisions;
   extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
 
-  buildInputs = [ makeWrapper texinfo wrapOctave ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ texinfo wrapOctave ];
 
   # During "build" we must first unlink the /share symlink to octave's /share
   # Then, we can re-symlink the all of octave/share, except for /share/octave
   # in env/share/octave, re-symlink everything from octave/share/octave and then
   # perform the pkg install.
   postBuild = ''
-      . "${makeWrapper}/nix-support/setup-hook"
-      # The `makeWrapper` used here is the one defined in
-      # ${makeWrapper}/nix-support/setup-hook
-
       if [ -L "$out/bin" ]; then
          unlink $out/bin
          mkdir -p "$out/bin"

pkgs/development/interpreters/perl/wrapper.nix

@@ -17,11 +17,10 @@ let
     inherit ignoreCollisions;
     extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
 
+    nativeBuildInputs = [ makeWrapper ];
+
     # we create wrapper for the binaries in the different packages
     postBuild = ''
-
-      . "${makeWrapper}/nix-support/setup-hook"
-
       if [ -L "$out/bin" ]; then
           unlink "$out/bin"
       fi

pkgs/development/interpreters/python/wrapper.nix

@@ -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