guix: fix riscv64 builds, remove squashfs-tools

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index ec0fd3cb10d3320a8f75c816defb10b936b1f489..1ad3e8a53e41082868b94308e102c92c49f99aaa 100755 (executable)
--- 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 2fdab5d1ea2fe642f8bc5bf9dc4767c5e4f95aa3..76fb53431786cb8588b8c2d06a6c85ace36de5cf 100644 (file)
--- 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