Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30534: guix: move bison from global scope, to L…
Browse files Browse the repository at this point in the history
…inux

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
  • Loading branch information
fanquake committed Jul 29, 2024
2 parents 38c30a4 + e6df348 commit ec7ba7a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/guix/manifest.scm
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@ inspecting signatures in Mach-O binaries.")
autoconf-2.71
automake
pkg-config
bison
;; Scripting
python-minimal ;; (3.10)
;; Git
Expand All @@ -537,7 +536,8 @@ inspecting signatures in Mach-O binaries.")
nss-certs
osslsigncode))
((string-contains target "-linux-")
(list (list gcc-toolchain-12 "static")
(list bison
(list gcc-toolchain-12 "static")
(make-bitcoin-cross-toolchain target)))
((string-contains target "darwin")
(list clang-toolchain-18
Expand Down

0 comments on commit ec7ba7a

Please sign in to comment.