guix: use rust 1.63 for building lianad

wizardsardine · Mar 26, 2024 · a4c4e1f · a4c4e1f
1 parent 7cae4e8
commit a4c4e1f
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/contrib/reproducible/guix/manifest.scm b/contrib/reproducible/guix/manifest.scm
@@ -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)))))))