futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: cargo: Use correct config file for cargo config.

Browse Source 
* guix/build/cargo-build-system.scm (configure): Use .cargo/config as
the config file.  Add a note.

Change-Id: Ice006c11184d4c8e1bdb765c3998b06ad299e55b
This commit is contained in:
Efraim Flashner 2023-11-28 12:58:36 +02:00
parent 6619021d32
commit 55faf486c7
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/build/cargo-build-system.scm
View File

@ -181,7 +181,8 @@ libraries or executables."
;; Configure cargo to actually use this new directory with all the crates. ;; Configure cargo to actually use this new directory with all the crates.
(setenv "CARGO_HOME" (string-append (getcwd) "/.cargo")) (setenv "CARGO_HOME" (string-append (getcwd) "/.cargo"))
(mkdir-p ".cargo") (mkdir-p ".cargo")
(let ((port (open-file ".cargo/config.toml" "w" #:encoding "utf-8"))) ;; Not .cargo/config.toml, rustc/cargo will generate .cargo/config otherwise.
(let ((port (open-file ".cargo/config" "w" #:encoding "utf-8")))
;; Placed here so it doesn't cause random rebuilds. Neither of these work. ;; Placed here so it doesn't cause random rebuilds. Neither of these work.
;; sysroot = '" (assoc-ref inputs "rust-sysroot") "' ;; sysroot = '" (assoc-ref inputs "rust-sysroot") "'
;; rustflags = ['--sysroot', '" (assoc-ref inputs "rust-sysroot") "'] ;; rustflags = ['--sysroot', '" (assoc-ref inputs "rust-sysroot") "']