Merge pull request #445 from bjornfor/adapt-to-make-binary-wrapper

Replace --suffix-each with multiple --suffix options
This commit is contained in:
DavHau 2022-06-01 13:35:25 +02:00 committed by GitHub
commit e0a83fde85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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: {