Skip to content

Commit

Permalink
Merge #1053: Backport #1052
Browse files Browse the repository at this point in the history
a4c4e1f guix: use rust 1.63 for building lianad (Antoine Poinsot)

Pull request description:

ACKs for top commit:
  darosior:
    self-ACK a4c4e1f

Tree-SHA512: 658c16f53d06960f1a1221b87ff68f90022a131cc75d575f7d45b97d0d706dab9fc3d1ff59eaa79beb04f921cf04cb514606986e949e630dc633ee0cb44183fc
  • Loading branch information
darosior committed Mar 26, 2024
2 parents 7cae4e8 + a4c4e1f commit c8a0a6e
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions contrib/reproducible/guix/manifest.scm
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@
"coreutils-minimal"
"patchelf"
"[email protected]")
;; Additional dependencies for building the GUI, and the regular rustc for building
;; the daemon and CLI.
;; Additional dependencies for building the GUI.
(if
(string=? is_gui "1")
(list "pkg-config"
"eudev"
"fontconfig")
(list "rust"))))
;; The GUI MSRV is 1.65. We could patch the requirements for new compiler features but
;; Iced 0.7 started relying on a lifetime that was treated as a bug until rustc 1.64. I
;; couldn't find how to fix it therefore we are relying on a Rust toolchain unpublished
;; by Guix to build the GUI.
'())))
;; The GUI's MSRV is 1.65 and the daemon's 1.63.
;; FIXME: be able to compile against a specified glibc (or musl) instead of having to
;; resort to not bumping the time machine and use at-the-time unpublished rustc.
(packages->manifest
(if
(string=? is_gui "1")
(list
(@@ (gnu packages rust) rust-1.65))
'())))))
(list
(@@ (gnu packages rust) rust-1.63)))))))

0 comments on commit c8a0a6e

Please sign in to comment.