diff options
| author | Artturin <Artturin@artturin.com> | 2023-08-15 01:01:54 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-08-15 01:20:56 +0300 |
| commit | 88b60b61b9b35d481d29157e93f07ee963b9c43c (patch) | |
| tree | 587d928f7ad57eb53e0913c5ab778eb6f416bca9 /pkgs/applications/audio/faust | |
| parent | 9594f53b996966eb87e2040561a589ff5419debc (diff) | |
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"))'
Diffstat (limited to 'pkgs/applications/audio/faust')
| -rw-r--r-- | pkgs/applications/audio/faust/faust2alqt.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/faust/faust2jaqt.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix index 1d86cc3f6c3f2..b12b41763ba59 100644 --- a/pkgs/applications/audio/faust/faust2alqt.nix +++ b/pkgs/applications/audio/faust/faust2alqt.nix @@ -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")" diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 90498c9e3e3a7..90b6ca218dd42 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -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")" |