build: Consider SOURCE_DATE_EPOCH in Guix environment only

hebasto · Mar 28, 2024 · d871c33 · d871c33
1 parent d1e9a02
commit d871c33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -129,8 +129,7 @@ deploydir: $(OSX_ZIP)
 else !BUILD_DARWIN
 APP_DIST_DIR=$(top_builddir)/dist
 
-$(OSX_ZIP): deploydir
-	if [ -n "$(SOURCE_DATE_EPOCH)" ]; then find $(APP_DIST_DIR) -exec touch -d @$(SOURCE_DATE_EPOCH) {} +; fi
+$(OSX_ZIP):
 	cd $(APP_DIST_DIR) && find . | sort | $(ZIP) -X@ $@
 
 $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
@@ -302,6 +302,9 @@ mkdir -p "$DISTSRC"
         *darwin*)
             make osx_volname ${V:+V=1}
             make deploydir ${V:+V=1}
+            find dist -print0 | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
+            make deploy ${V:+V=1} OSX_ZIP="${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip"
+
             mkdir -p "unsigned-app-${HOST}"
             cp  --target-directory="unsigned-app-${HOST}" \
                 osx_volname \
@@ -315,7 +318,6 @@ mkdir -p "$DISTSRC"
                     | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" \
                     || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" && exit 1 )
             )
-            make deploy ${V:+V=1} OSX_ZIP="${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip"
             ;;
     esac
     (