colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: fix cross makeWrapper eval

Browse Source 
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"))'
This commit is contained in:
Artturin 2023-08-15 01:01:54 +03:00
parent 9594f53b99
commit 88b60b61b9
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/faust/faust2alqt.nix
View File

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

4
pkgs/applications/audio/faust/faust2jaqt.nix
View File

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

5
pkgs/top-level/all-packages.nix
View File

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