From c355370c0f059ee5bedfd22b23e581cacbbb5a6c Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sun, 6 Oct 2024 21:14:33 +0200 Subject: [PATCH] guix: fix riscv64 builds, remove squashfs-tools --- contrib/guix/libexec/build.sh | 18 ++++++++++++------ contrib/guix/manifest.scm | 1 - 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index ec0fd3cb..1ad3e8a5 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -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}" diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 2fdab5d1..76fb5343 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -294,7 +294,6 @@ chain for " target " development.")) bison gperf gettext-minimal - squashfs-tools cmake-minimal meson ninja -- 2.52.0