guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: build-system/cargo: Don't install .crates.toml fi


From: guix-commits
Subject: branch master updated: build-system/cargo: Don't install .crates.toml file.
Date: Tue, 06 Oct 2020 03:39:23 -0400

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c1cc0c4  build-system/cargo: Don't install .crates.toml file.
c1cc0c4 is described below

commit c1cc0c4865a8bfff43c5c9bd6ae8dcadb061c8a0
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Oct 6 10:29:47 2020 +0300

    build-system/cargo: Don't install .crates.toml file.
    
    Fixes <https://issues.guix.gnu.org/43810>.
    
    * guix/build/cargo-build-system.scm (install): Remove installed
    .crates.toml file.
---
 guix/build/cargo-build-system.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/guix/build/cargo-build-system.scm 
b/guix/build/cargo-build-system.scm
index 95e8dd7..117c8da 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -173,7 +173,13 @@ directory = '" port)
     (or skip-build?
         (not (has-executable-target?))
         (invoke "cargo" "install" "--path" "." "--root" out
-                "--features" (string-join features)))))
+                "--features" (string-join features)))
+
+    ;; This is a file which we definitely don't need installed.
+    (when (file-exists? (string-append out "/.crates.toml"))
+      (delete-file (string-append out "/.crates.toml")))
+
+    #t))
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases



reply via email to

[Prev in Thread] Current Thread [Next in Thread]