treewide: fix cross makeWrapper eval

fix `error: makeWrapper/makeShellWrapper must be in nativeBuildInputs`

The `faust.faust2ApplBase` in used in `faust2sc` + more, requires
changes because it puts all the callPackage arguments in the
`mkDerivation` call and thus causes a eval fail

`nix-eval-jobs --flake ".#legacyPackages.x86_64-linux.pkgsCross.aarch64-multiplatform" --workers 2 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("makeWrapper/makeShellWrapper"))'

Artturin 88b60b61 9594f53b

+8 -5
+2 -2
pkgs/applications/audio/faust/faust2alqt.nix
··· 2 2 , alsa-lib 3 3 , qtbase 4 4 , writeText 5 - , makeWrapper 5 + , buildPackages 6 6 }: 7 7 let 8 8 # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH 9 9 wrapBinary = writeText "wrapBinary" '' 10 - source ${makeWrapper}/nix-support/setup-hook 10 + source ${buildPackages.makeWrapper}/nix-support/setup-hook 11 11 for p in $FILES; do 12 12 workpath=$PWD 13 13 cd -- "$(dirname "$p")"
+2 -2
pkgs/applications/audio/faust/faust2jaqt.nix
··· 4 4 , libsndfile 5 5 , alsa-lib 6 6 , writeText 7 - , makeWrapper 7 + , buildPackages 8 8 , which 9 9 }: 10 10 let 11 11 # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH 12 12 wrapBinary = writeText "wrapBinary" '' 13 - source ${makeWrapper}/nix-support/setup-hook 13 + source ${buildPackages.makeWrapper}/nix-support/setup-hook 14 14 for p in $FILES; do 15 15 workpath=$PWD 16 16 cd -- "$(dirname "$p")"
+4 -1
pkgs/top-level/all-packages.nix
··· 13713 13713 13714 13714 tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; 13715 13715 13716 - tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); 13716 + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { 13717 + pkgs = pkgs.__splicedPackages; 13718 + }); 13717 13719 13718 13720 tmsu = callPackage ../tools/filesystems/tmsu { }; 13719 13721 ··· 16167 16169 16168 16170 idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { 16169 16171 idris-no-deps = haskellPackages.idris; 16172 + pkgs = pkgs.__splicedPackages; 16170 16173 }); 16171 16174 16172 16175 idris = idrisPackages.with-packages [ idrisPackages.base ] ;