diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-12-17 16:51:49 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-02-20 13:56:17 +0200 |
| commit | 072a9c60ab6b55666c647a80aebab82fd21cb32b (patch) | |
| tree | 5372ead88d5e309cd55ef1f154574224f772002a /gnu/packages/rust.scm | |
| parent | 193a01d73f002642bae8a5a4f9a68a089f66ffe4 (diff) | |
| download | guix-072a9c60ab6b55666c647a80aebab82fd21cb32b.tar guix-072a9c60ab6b55666c647a80aebab82fd21cb32b.tar.gz | |
gnu: rust: Move remove-uninstall-script to rust.
* gnu/packages/rust.scm (rust)[arguments]: Add 'remove-uninstall-script
phase.
(make-rust-sysroot)[arguments]: Remove 'remove-uninstall-script phase.
Change-Id: I45bcaaa89003693b490b914efbfa34236a8f4db6
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 104834deab..c3a7838a34 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1041,6 +1041,12 @@ safety and thread safety guarantees.") (mkdir-p (string-append out dest)) (copy-recursively "library" (string-append out dest "/library")) (copy-recursively "src" (string-append out dest "/src"))))) + (add-after 'install 'remove-uninstall-script + (lambda* (#:key outputs #:allow-other-keys) + ;; This script has no use on Guix + ;; and it retains a reference to the host's bash. + (delete-file (string-append (assoc-ref outputs "out") + "/lib/rustlib/uninstall.sh")))) (add-after 'install-rust-src 'wrap-rust-analyzer (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "tools") "/bin"))) @@ -1195,12 +1201,6 @@ ar = \"" (search-input-file inputs (string-append "/bin/" ,(ar-for-target target (replace 'install (lambda _ (invoke "./x.py" "install" "library/std"))) - (add-after 'install 'remove-uninstall-script - (lambda* (#:key outputs #:allow-other-keys) - ;; This script has no use on Guix - ;; and it retains a reference to the host's bash. - (delete-file (string-append (assoc-ref outputs "out") - "/lib/rustlib/uninstall.sh")))) (delete 'install-rust-src) (delete 'wrap-rust-analyzer) (delete 'wrap-rustc))))) |