davie/guile-env
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rust: Use mounted directory when present

Browse source
This commit is contained in:
Davie Li 2024-01-15 18:30:26 +01:00
parent 0be12f9a87
commit 1fdebc187c
Signed by: davie
GPG key ID: 29FD88532FC91BF4
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
env/rust.scm vendored
View file

@ -171,11 +171,16 @@ function."
(throw 'file-doesnt-exist)))))))) (throw 'file-doesnt-exist))))))))
(let* ((target (string-append (@@ (env) %env-directory) "/" target-name)) (let* ((target (string-append (@@ (env) %env-directory) "/" target-name))
(mnt (mount-environment env #:tag tag #:target target)) ;; TODO should actually detect if overlay is mounted not that the
;; directory exists.
(mnt (if (file-exists? target)
target
(overlay-mount-merged
(mount-environment env #:tag tag #:target target))))
(mappings (append (map (remap #f) expose) (mappings (append (map (remap #f) expose)
(map (remap #t) share)))) (map (remap #t) share))))
(exec-in-rustup-environment '("./.cargo/bin/rust-analyzer") (exec-in-rustup-environment '("./.cargo/bin/rust-analyzer")
#:home (overlay-mount-merged mnt) #:home mnt
#:mappings mappings) #:mappings mappings)
(sync) (sync)
(system* "umount" target) (system* "umount" target)