Commit 88b60b61 authored by Artturin's avatar Artturin
Browse files

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"))'
parent 9594f53b

pkgs/applications/audio/faust/faust2alqt.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
, alsa-lib

, qtbase

, writeText

, makeWrapper

, buildPackages

}:

let

  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH

  wrapBinary = writeText "wrapBinary" ''

    source ${makeWrapper}/nix-support/setup-hook

    source ${buildPackages.makeWrapper}/nix-support/setup-hook

    for p in $FILES; do

      workpath=$PWD

      cd -- "$(dirname "$p")"

pkgs/applications/audio/faust/faust2jaqt.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
, libsndfile

, alsa-lib

, writeText

, makeWrapper

, buildPackages

, which

}:

let

  # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH

  wrapBinary = writeText "wrapBinary" ''

    source ${makeWrapper}/nix-support/setup-hook

    source ${buildPackages.makeWrapper}/nix-support/setup-hook

    for p in $FILES; do

      workpath=$PWD

      cd -- "$(dirname "$p")"

pkgs/top-level/all-packages.nix

+4 −1
Original line number Diff line number Diff line
@@ -13713,7 +13713,9 @@ with pkgs; 














  tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { };



























  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });













  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins {













    pkgs = pkgs.__splicedPackages;













  });





























  tmsu = callPackage ../tools/filesystems/tmsu { };
























@@ -16167,6 +16169,7 @@ with pkgs;



























  idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {















    idris-no-deps = haskellPackages.idris;













    pkgs = pkgs.__splicedPackages;















  });





























  idris = idrisPackages.with-packages [ idrisPackages.base ] ;