Skip to content

Commit c34e7ab

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge 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
1 parent da11d29 commit c34e7ab

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
@@ -528,7 +528,6 @@ inspecting signatures in Mach-O binaries.")
528528
autoconf-2.71
529529
automake
530530
pkg-config
531-
bison
532531
;; Scripting
533532
python-minimal ;; (3.10)
534533
;; Git
@@ -543,7 +542,8 @@ inspecting signatures in Mach-O binaries.")
543542
nss-certs
544543
osslsigncode))
545544
((string-contains target "-linux-")
546-
(list (list gcc-toolchain-12 "static")
545+
(list bison
546+
(list gcc-toolchain-12 "static")
547547
(make-bitcoin-cross-toolchain target)))
548548
((string-contains target "darwin")
549549
(list clang-toolchain-18

0 commit comments

Comments
 (0)