guix: split macOS and win builds

diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index 5b3eb3d9..9679e24b 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -449,11 +449,25 @@ EOF
                                     "${shell_opts[@]}" \
                                     bash -c "cd /bitcoin && bash contrib/guix/libexec/build_linux_gui.sh"
             ;;
-            *)
+            *darwin*)
+            time-machine shell --root="$(profiledir_for_host "${HOST}")" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_macos.sh"
+
             time-machine shell --manifest="${PWD}/contrib/guix/manifest_gui.scm" \
-                                    --root="$(profiledir_for_host "${HOST}")" \
+                                    --root="$(profiledir_for_host "${HOST}"_gui)" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_macos_gui.sh"
+            ;;
+            *mingw*)
+            time-machine shell --root="$(profiledir_for_host "${HOST}")" \
+                                    "${shell_opts[@]}" \
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_win.sh"
+
+            time-machine shell --manifest="${PWD}/contrib/guix/manifest_gui.scm" \
+                                    --root="$(profiledir_for_host "${HOST}"_gui)" \
                                     "${shell_opts[@]}" \
-                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build.sh"
+                                    bash -c "cd /bitcoin && bash contrib/guix/libexec/build_win_gui.sh"
             ;;
         esac
     )
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
deleted file mode 100755
index 3b42cda6..00000000
--- a/contrib/guix/libexec/build.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2019-present The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-export LC_ALL=C
-set -o errexit -o pipefail
-
-# shellcheck source=setup.sh
-source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
-
-# Set environment variables to point the NATIVE toolchain to the right
-# includes/libs
-NATIVE_GCC="$(store_path gcc-toolchain)"
-
-# Set native toolchain
-build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
-build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
-
-# Required for native packages
-export LIBRARY_PATH="${NATIVE_GCC}/lib"
-
-# Set environment variables to point the CROSS toolchain to the right
-# includes/libs for $HOST
-case "$HOST" in
-    *mingw*)
-        # Determine output paths to use in CROSS_* environment variables
-        CROSS_GLIBC="$(store_path "mingw-w64-x86_64-winpthreads")"
-        CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
-        CROSS_GCC_LIB_STORE="$(store_path "gcc-cross-${HOST}" lib)"
-        CROSS_GCC_LIBS=( "${CROSS_GCC_LIB_STORE}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
-        CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)
-
-        # The search path ordering is generally:
-        #    1. gcc-related search paths
-        #    2. libc-related search paths
-        #    2. kernel-header-related search paths (not applicable to mingw-w64 hosts)
-        export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include"
-        export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
-        export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
-        ;;
-    *darwin*)
-        # The CROSS toolchain for darwin uses the SDK and ignores environment variables.
-        # See depends/hosts/darwin.mk for more details.
-        ;;
-    *)
-        exit 1 ;;
-esac
-
-# Sanity check CROSS_*_PATH directories
-IFS=':' read -ra PATHS <<< "${CROSS_C_INCLUDE_PATH}:${CROSS_CPLUS_INCLUDE_PATH}:${CROSS_LIBRARY_PATH}"
-for p in "${PATHS[@]}"; do
-    if [ -n "$p" ] && [ ! -d "$p" ]; then
-        echo "'$p' doesn't exist or isn't a directory... Aborting..."
-        exit 1
-    fi
-done
-
-####################
-# Depends Building #
-####################
-
-# Build the depends tree
-make -C depends --jobs="$JOBS" HOST="$HOST" \
-                                   ${V:+V=1} \
-                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
-                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
-                                   ${SDK_PATH+SDK_PATH="$SDK_PATH"} \
-                                   ${build_CC+build_CC="$build_CC"} \
-                                   ${build_CXX+build_CXX="$build_CXX"}
-
-case "$HOST" in
-    *darwin*)
-        # Unset now that Qt is built
-        unset LIBRARY_PATH
-        ;;
-esac
-
-###########################
-# Binary Tarball Building #
-###########################
-
-# CONFIGFLAGS
-CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD_FUZZ_BINARY=OFF -DCMAKE_SKIP_RPATH=TRUE"
-
-# CFLAGS
-HOST_CFLAGS="-O2 -g"
-HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
-HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
-case "$HOST" in
-    *mingw*)  HOST_CFLAGS+=" -fno-ident" ;;
-    *darwin*) unset HOST_CFLAGS ;;
-esac
-
-# CXXFLAGS
-HOST_CXXFLAGS="$HOST_CFLAGS"
-
-# LDFLAGS
-case "$HOST" in
-    *mingw*)  HOST_LDFLAGS="-Wl,--no-insert-timestamp" ;;
-esac
-
-mkdir -p "$DISTSRC"
-(
-    cd "$DISTSRC"
-
-    # Extract the source tarball
-    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
-
-    # Configure this DISTSRC for $HOST
-    # shellcheck disable=SC2086
-    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
-    cmake -S . -B build \
-          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
-          -DWITH_CCACHE=OFF \
-          -Werror=dev \
-          ${CONFIGFLAGS}
-
-    # Build Bitcoin Core
-    cmake --build build -j "$JOBS"
-
-    # Make the os-specific installers
-    case "$HOST" in
-        *mingw*)
-            cmake --build build -j "$JOBS" -t deploy
-            mv build/bitcoin-win64-setup.exe "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
-            ;;
-    esac
-
-    # Setup the directory where our Bitcoin Core build for HOST will be
-    # installed. This directory will also later serve as the input for our
-    # binary tarballs.
-    mkdir -p "${INSTALLPATH}"
-    # Install built Bitcoin Core to $INSTALLPATH
-    case "$HOST" in
-        *darwin*)
-            cmake --install build --strip --prefix "${INSTALLPATH}"
-            ;;
-        *)
-            cmake --install build --prefix "${INSTALLPATH}"
-            ;;
-    esac
-)  # $DISTSRC
-
-# shellcheck source=package.sh
-source "$(dirname "${BASH_SOURCE[0]}")/package.sh"
diff --git a/contrib/guix/libexec/build_macos.sh b/contrib/guix/libexec/build_macos.sh
new file mode 100755
index 00000000..213ae9a6
--- /dev/null
+++ b/contrib/guix/libexec/build_macos.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# Set environment variables to point the NATIVE toolchain to the right
+# includes/libs
+NATIVE_GCC="$(store_path gcc-toolchain)"
+
+# Set native toolchain
+build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
+build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${SDK_PATH+SDK_PATH="$SDK_PATH"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"} \
+                                   NO_QT=1
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -Werror=dev \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DCMAKE_SKIP_RPATH=TRUE \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS"
+
+    # Install built Bitcoin Core
+    cmake --install build --strip
+)
+
+rm -rf "$DISTSRC"/build
+
+exit 0
diff --git a/contrib/guix/libexec/build_macos_gui.sh b/contrib/guix/libexec/build_macos_gui.sh
new file mode 100755
index 00000000..97f1932d
--- /dev/null
+++ b/contrib/guix/libexec/build_macos_gui.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# Set environment variables to point the NATIVE toolchain to the right
+# includes/libs
+NATIVE_GCC="$(store_path gcc-toolchain)"
+
+# Set native toolchain
+build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
+build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${SDK_PATH+SDK_PATH="$SDK_PATH"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"}
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -DWITH_CCACHE=OFF \
+          -Werror=dev \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_BITCOIN_BIN=OFF \
+          -DBUILD_CLI=OFF \
+          -DBUILD_DAEMON=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_TX=OFF \
+          -DBUILD_UTIL=OFF \
+          -DBUILD_WALLET_TOOL=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DCMAKE_SKIP_RPATH=TRUE \
+          -DREDUCE_EXPORTS=ON
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS" --target bitcoin-gui bitcoin-qt
+
+    # Install built Bitcoin Core
+    cmake --install build --strip --component bitcoin-gui
+    cmake --install build --strip --component bitcoin-qt
+)
+
+# shellcheck source=package.sh
+source "$(dirname "${BASH_SOURCE[0]}")/package.sh"
diff --git a/contrib/guix/libexec/build_win.sh b/contrib/guix/libexec/build_win.sh
new file mode 100755
index 00000000..fc3b46aa
--- /dev/null
+++ b/contrib/guix/libexec/build_win.sh
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# Set environment variables to point the NATIVE toolchain to the right
+# includes/libs
+NATIVE_GCC="$(store_path gcc-toolchain)"
+
+# Set native toolchain
+build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
+build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
+
+# Set environment variables to point the CROSS toolchain to the right
+# includes/libs for $HOST
+# Determine output paths to use in CROSS_* environment variables
+CROSS_GLIBC="$(store_path "mingw-w64-x86_64-winpthreads")"
+CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
+CROSS_GCC_LIB_STORE="$(store_path "gcc-cross-${HOST}" lib)"
+CROSS_GCC_LIBS=( "${CROSS_GCC_LIB_STORE}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
+CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)
+
+# The search path ordering is generally:
+#    1. gcc-related search paths
+#    2. libc-related search paths
+#    2. kernel-header-related search paths (not applicable to mingw-w64 hosts)
+export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include"
+export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
+export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
+
+check_cross_paths "${CROSS_C_INCLUDE_PATH}:${CROSS_CPLUS_INCLUDE_PATH}:${CROSS_LIBRARY_PATH}"
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"} \
+                                   NO_QT=1
+
+# CFLAGS
+HOST_CFLAGS="-O2 -g"
+HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
+HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
+HOST_CFLAGS+=" -fno-ident"
+
+# CXXFLAGS
+HOST_CXXFLAGS="$HOST_CFLAGS"
+
+# LDFLAGS
+HOST_LDFLAGS="-Wl,--no-insert-timestamp"
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+    cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -Werror=dev \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS"
+
+    # Install built Bitcoin Core
+    cmake --install build
+)
+
+rm -rf "$DISTSRC"/build
+
+exit 0
diff --git a/contrib/guix/libexec/build_win_gui.sh b/contrib/guix/libexec/build_win_gui.sh
new file mode 100755
index 00000000..aba93eb0
--- /dev/null
+++ b/contrib/guix/libexec/build_win_gui.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+export LC_ALL=C
+set -o errexit -o pipefail
+
+# shellcheck source=setup.sh
+source "$(dirname "${BASH_SOURCE[0]}")/setup.sh"
+
+# Set environment variables to point the NATIVE toolchain to the right
+# includes/libs
+NATIVE_GCC="$(store_path gcc-toolchain)"
+
+# Set native toolchain
+build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
+build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
+
+# Set environment variables to point the CROSS toolchain to the right
+# includes/libs for $HOST
+# Determine output paths to use in CROSS_* environment variables
+CROSS_GLIBC="$(store_path "mingw-w64-x86_64-winpthreads")"
+CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
+CROSS_GCC_LIB_STORE="$(store_path "gcc-cross-${HOST}" lib)"
+CROSS_GCC_LIBS=( "${CROSS_GCC_LIB_STORE}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
+CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)
+
+# The search path ordering is generally:
+#    1. gcc-related search paths
+#    2. libc-related search paths
+#    2. kernel-header-related search paths (not applicable to mingw-w64 hosts)
+export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include"
+export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
+export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
+
+check_cross_paths "${CROSS_C_INCLUDE_PATH}:${CROSS_CPLUS_INCLUDE_PATH}:${CROSS_LIBRARY_PATH}"
+
+# Build the depends tree
+make -C depends --jobs="$JOBS" HOST="$HOST" \
+                                   ${V:+V=1} \
+                                   ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
+                                   ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
+                                   ${build_CC+build_CC="$build_CC"} \
+                                   ${build_CXX+build_CXX="$build_CXX"}
+
+# CFLAGS
+HOST_CFLAGS="-O2 -g"
+HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
+HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=."
+HOST_CFLAGS+=" -fno-ident"
+
+# CXXFLAGS
+HOST_CXXFLAGS="$HOST_CFLAGS"
+
+# LDFLAGS
+HOST_LDFLAGS="-Wl,--no-insert-timestamp"
+
+mkdir -p "$DISTSRC"
+(
+    cd "$DISTSRC"
+
+    # Extract the source tarball
+    tar --strip-components=1 -xf "${GIT_ARCHIVE}"
+
+    # Configure this DISTSRC for $HOST
+    env CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
+    cmake -S . -B build \
+          --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
+          -Werror=dev \
+          -DBUILD_BENCH=OFF \
+          -DBUILD_BITCOIN_BIN=OFF \
+          -DBUILD_CLI=OFF \
+          -DBUILD_DAEMON=OFF \
+          -DBUILD_FUZZ_BINARY=OFF \
+          -DBUILD_GUI_TESTS=OFF \
+          -DBUILD_TESTS=OFF \
+          -DBUILD_TX=OFF \
+          -DBUILD_UTIL=OFF \
+          -DBUILD_WALLET_TOOL=OFF \
+          -DCMAKE_INSTALL_PREFIX="${INSTALLPATH}" \
+          -DREDUCE_EXPORTS=ON \
+          -DWITH_CCACHE=OFF
+
+    # Build Bitcoin Core
+    cmake --build build -j "$JOBS" --target bitcoin-qt
+
+    # Install built Bitcoin Core
+    cmake --install build --component bitcoin-qt
+)
+
+# shellcheck source=package.sh
+source "$(dirname "${BASH_SOURCE[0]}")/package.sh"
diff --git a/contrib/guix/libexec/package.sh b/contrib/guix/libexec/package.sh
index d91fa634..fd080ccf 100755
--- a/contrib/guix/libexec/package.sh
+++ b/contrib/guix/libexec/package.sh
@@ -86,6 +86,10 @@ set -e -o pipefail
     # Finally make tarballs for codesigning
     case "$HOST" in
         *mingw*)
+            # Make the installer
+            cmake -D BIN_DIR="${INSTALLPATH}/bin" -D LIBEXEC_DIR="${INSTALLPATH}/libexec" -P build/GenerateWindowsInstaller.cmake
+            mv build/bitcoin-win64-setup.exe "${OUTDIR}/${DISTNAME}-win64-setup-unsigned.exe"
+
             cp -rf --target-directory=. contrib/windeploy
             (
                 cd ./windeploy