diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-05-06 23:19:49 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-05-07 00:11:56 -0700 |
| commit | 5838729f9e97689554d994fe59521f9a2ea35ce1 (patch) | |
| tree | a0970619a66e7c1a720dbdf13ae6ee34dcda1071 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 78963777a40a63333520c5c8f4567b4059b68c4d (diff) | |
release-cross.nix: fix the fix in #188339
The `bootstrapTools.bootstrapTools` attribute, which *unpacks* the
bootstrapFiles, lies about its `system`:
https://github.com/NixOS/nixpkgs/blob/78963777a40a63333520c5c8f4567b4059b68c4d/pkgs/stdenv/linux/make-bootstrap-tools.nix#L236
Unfortunately because of this, when building `bootstrapTools.*`,
Hydra will try to execute the cross-compiled bootstrapFiles'
`busybox` on the wrong architecture, and fail.
I originally submitted a fix for this, by filtering out the
`.bootstrapTools` attribute, in
https://github.com/NixOS/nixpkgs/pull/188339
Unfortunately my fix filtered at the wrong level of the attrset
hierarchy, and neglected to filter the `test` attribute as well.
This PR corrects those mistakes
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions