guix: fix riscv64 builds, remove squashfs-tools

This commit is contained in:
tobtoht 2024-10-06 21:14:33 +02:00
parent f3cd346723
commit c355370c0f
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 12 additions and 7 deletions
contrib/guix

View file

@ -477,12 +477,18 @@ mkdir -p "$DISTSRC"
|| ( rm -f "${OUTDIR}/${DISTNAME}-linux${LINUX_ARCH}${ANONDIST}.zip" && exit 1 )
;;
esac
find . -name "*.AppImage" -print0 \
| xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
find . -name "*.AppImage" \
| sort \
| zip -X@ "${OUTDIR}/${DISTNAME}-linux${LINUX_ARCH}-appimage${ANONDIST}.zip" \
|| ( rm -f "${OUTDIR}/${DISTNAME}-linux${LINUX_ARCH}-appimage${ANONDIST}.zip" && exit 1 )
case "$HOST" in
riscv64-*)
;;
*)
find . -name "*.AppImage" -print0 \
| xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
find . -name "*.AppImage" \
| sort \
| zip -X@ "${OUTDIR}/${DISTNAME}-linux${LINUX_ARCH}-appimage${ANONDIST}.zip" \
|| ( rm -f "${OUTDIR}/${DISTNAME}-linux${LINUX_ARCH}-appimage${ANONDIST}.zip" && exit 1 )
;;
esac
else
find . -print0 \
| xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"

View file

@ -294,7 +294,6 @@ chain for " target " development."))
bison
gperf
gettext-minimal
squashfs-tools
cmake-minimal
meson
ninja