guix: fix riscv64 builds, remove squashfs-tools

feather-wallet · Oct 6, 2024 · c355370 · c355370
1 parent f3cd346
commit c355370
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -294,7 +294,6 @@ chain for " target " development."))
         bison
         gperf
         gettext-minimal
-        squashfs-tools
         cmake-minimal
         meson
         ninja
-Original file line number
+Diff line change
@@ Expand Up / @@ -294,7 +294,6 @@ chain for " target " development.")) @@
             bison
             gperf
             gettext-minimal
-            squashfs-tools
             cmake-minimal
             meson
             ninja
@@ Expand Down @@