bug#74470: Bug: guile-fibers@1.1.1 arm crosscompile fails due to patch on 1.3.1 version

[Razvan Lixandru]

Hello,

It looks like this commit:
https://git.savannah.gnu.org/cgit/guix.git/commit/gnu/packages/guile-xyz.scm?id=20c7b8dd04e421a139a02438cf1ddfdfe544a446
causes guile-fiber@1.1.1 which is pulled by shepherd to fail:

phase `unpack' succeeded after 0.0 seconds
starting phase `apply-cross-build-fix-patch'
patching file build-aux/guile.am
Hunk #1 FAILED at 22.
1 out of 1 hunk FAILED -- saving rejects to file build-aux/guile.am.rej
error: in phase 'apply-cross-build-fix-patch': uncaught exception:
%exception #<&invoke-error program: "patch" arguments: ("--force"
"-p1" "-i" 
"/gnu/store/97r1rrxa9ghrj5qp3din1pg6p2lcpzyv-guile-fibers-cross-build-fix.patch")
exit-status: 1 term-signal: #f stop-signal: #f>
phase `apply-cross-build-fix-patch' failed after 0.0 seconds
command "patch" "--force" "-p1" "-i"
"/gnu/store/97r1rrxa9ghrj5qp3din1pg6p2lcpzyv-guile-fibers-cross-build-fix.patch"
failed with status 1
build process 18 exited with status 256

This happens on both arm-linux-gnueabihf and arm64-linux-gnu.
I think it is happening because the 1.1.1 version inherits 1.3.1.
package and it overrides the source, but the patch is still being
applied.

I guess this brakes all arm* crossbuilds.

Cheers,
Razvan