diff mbox series

[bug#70690] gnu: rust: install rust-analyzer-proc-macro-srv

Message ID 20240501034732.1748656-1-brennan@umanwizard.com
State New
Headers show
Series [bug#70690] gnu: rust: install rust-analyzer-proc-macro-srv | expand

Commit Message

Brennan Vincent May 1, 2024, 3:47 a.m. UTC 
* gnu/packages/rust.scm (rust): Install rust-analyzer-proc-macro-srv
rust-analyzer relies on this binary existing, and recent versions
of rust no longer install it by default.

Change-Id: I7ce59c065a35cf2592e7eb2fa57317aa9a8df675
---
 gnu/packages/rust.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 8cbbac53ac..24783d8aa2 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1214,7 +1214,9 @@  (define-public rust
                            "src/tools/cargo"
                            "src/tools/clippy"
                            "src/tools/rust-analyzer"
-                           "src/tools/rustfmt"))))
+                           "src/tools/rust-analyzer/crates/proc-macro-srv-cli"
+                           "src/tools/rustfmt"))
+                 ))
              (replace 'check
                ;; Phase overridden to also test more tools.
                (lambda* (#:key tests? parallel-build? #:allow-other-keys)
@@ -1244,7 +1246,16 @@  (define-public rust
                     (format #f "prefix = ~s" (assoc-ref outputs "tools"))))
                  (invoke "./x.py" "install" "clippy")
                  (invoke "./x.py" "install" "rust-analyzer")
-                 (invoke "./x.py" "install" "rustfmt")))
+                 (invoke "./x.py" "install" "rustfmt")
+                 ;; ./x.py doesn't have an install target
+                 ;; for the proc macro server, so we install it manually
+                 (let* ((out (assoc-ref outputs "out"))
+                        (platform ,(platform-rust-target
+                                    (lookup-platform-by-target-or-system
+                                     (or (%current-target-system)
+                                         (%current-system))))))
+                   (install-file (string-append "build/" platform "/stage2-tools/" platform "/release/rust-analyzer-proc-macro-srv")
+                                 (string-append out "/libexec")))))
              (add-after 'install 'install-rust-src
                (lambda* (#:key outputs #:allow-other-keys)
                  (let ((out (assoc-ref outputs "rust-src"))