nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1052: guix: use rust 1.63 for building lianad

Browse Source 
2e191f3496285f0133a61ab7f0985489aa8406de guix: use rust 1.63 for building lianad (Antoine Poinsot)

Pull request description:

ACKs for top commit:
  darosior:
    self-ACK 2e191f3496285f0133a61ab7f0985489aa8406de

Tree-SHA512: 52f79ce71a1c61f966f4890149b169093f0ceeda35afb18980983557a05cb6892bafbdedd2f404d9f62c348b83524e9b20aa7beee66ee1ef2e53dcb2a3636925
This commit is contained in:
Antoine Poinsot 2024-03-26 14:08:32 +01:00
commit 771bf16b58
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/reproducible/guix/manifest.scm
View File

@ -8,21 +8,20 @@
"coreutils-minimal"
"patchelf"
"gcc-toolchain@10.3.0")
;; 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)))))))