Skip to content

Commit ec7ba7a

Browse files
committed
Merge bitcoin/bitcoin#30534: guix: move bison from global scope, to Linux
e6df348 guix: move bison from global scope, to Linux (fanquake) Pull request description: This is only needed for the Qt build (libxkbcommon), on Linux, so does not need to be built/present for the macOS or Windows builds. ACKs for top commit: hebasto: ACK e6df348. TheCharlatan: ACK e6df348 Tree-SHA512: b66111e398b4fce88f912adfd808d537e2d85e1f0078befd264bb700b201ca1bbe322810e80a212e0023657e9e3693a106761c43743d66aabd16e2afe7f599e6
2 parents 38c30a4 + e6df348 commit ec7ba7a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/guix/manifest.scm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,6 @@ inspecting signatures in Mach-O binaries.")
522522
autoconf-2.71
523523
automake
524524
pkg-config
525-
bison
526525
;; Scripting
527526
python-minimal ;; (3.10)
528527
;; Git
@@ -537,7 +536,8 @@ inspecting signatures in Mach-O binaries.")
537536
nss-certs
538537
osslsigncode))
539538
((string-contains target "-linux-")
540-
(list (list gcc-toolchain-12 "static")
539+
(list bison
540+
(list gcc-toolchain-12 "static")
541541
(make-bitcoin-cross-toolchain target)))
542542
((string-contains target "darwin")
543543
(list clang-toolchain-18

0 commit comments

Comments
 (0)