Replace --suffix-each with multiple --suffix options
Since
7f802c7046
using --suffix-each in makeWrapperArgs is no longer supported and breaks
like this:
$ nix-build ./any-mach-nix-env-with-latest-nixpkgs.nix
[...]
<stdin>: In function 'main':
<stdin>:9:6: error: #error makeCWrapper: Unknown argument --suffix-each
<stdin>:10:6: error: #error makeCWrapper: Unknown argument PATH
<stdin>:11:6: error: #error makeCWrapper: Unknown argument :
<stdin>:12:6: error: #error makeCWrapper: Unknown argument
builder for '/nix/store/41713mrzrqlq12kgfgcx10wmdvmkfh7k-python3-3.9.12-env.drv' failed with exit code 1
So replace it with multiple --suffix args, which the new
makeBinaryWrapper/makeCWrapper program supports (and is compatible with
the old makeWrapper).
Fixes https://github.com/DavHau/mach-nix/issues/444.
This commit is contained in:
parent
86c3111786
commit
afce97038d
1 changed files with 3 additions and 4 deletions
|
@ -126,10 +126,9 @@ let
|
|||
});
|
||||
final_env = py_final_with_pkgs.override (oa: {
|
||||
inherit ignoreCollisions;
|
||||
makeWrapperArgs = [
|
||||
''--suffix-each PATH ":" "${toString (map (p: "${p}/bin") extra_pkgs_other)}"''
|
||||
''--set QT_PLUGIN_PATH ${py_final_with_pkgs}/plugins''
|
||||
];
|
||||
makeWrapperArgs =
|
||||
(map (p: "--suffix PATH : ${p}/bin") extra_pkgs_other)
|
||||
++ [''--set QT_PLUGIN_PATH ${py_final_with_pkgs}/plugins''];
|
||||
});
|
||||
in let
|
||||
self = final_env.overrideAttrs (oa: {
|
||||
|
|
Loading…
Reference in a new issue