aboutsummaryrefslogtreecommitdiff
path: root/contrib/guix
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2021-06-28 16:55:32 -0400
committerCarl Dong <contact@carldong.me>2021-07-01 16:20:28 -0400
commitdc4137a60c99979b89f75d2bddba96d043f387b8 (patch)
tree91012748d67522898a2b048dfcc02ce0ac71d237 /contrib/guix
parent16b0a936e15b81710755303e11ef51f608b61475 (diff)
guix: Build depends/qt with our platform definition
Our 'bitcoin-linux-g++' definition better integrates with our depends system than the stock linux-g++-64 definition. This fixes a bug whereby Guix builds on x86_64 for x86_64 did not produce a QMinimalIntegrationPlugin and led to bitcoin-qt not being built.
Diffstat (limited to 'contrib/guix')
-rwxr-xr-xcontrib/guix/libexec/build.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 6741328473..9351c54229 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -214,6 +214,7 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \
x86_64_linux_NM=x86_64-linux-gnu-nm \
x86_64_linux_STRIP=x86_64-linux-gnu-strip \
qt_config_opts_i686_linux='-platform linux-g++ -xplatform bitcoin-linux-g++' \
+ qt_config_opts_x86_64_linux='-platform linux-g++ -xplatform bitcoin-linux-g++' \
FORCE_USE_SYSTEM_CLANG=1