From 0bb9a80460b4c4e74bfaf6df367709b6baac3f55 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 28 Aug 2020 09:47:18 -0700 Subject: [PATCH 2/2] Add lld to rust inputs. --- gnu/packages/rust.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 75853d66fc..d7933cc4bc 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1355,6 +1355,9 @@ move around." "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"))) (package (inherit base-rust) + (inputs + `(("lld" ,lld-9) + ,@(package-inputs base-rust))) (native-inputs `(("node" ,node) ,@(package-native-inputs base-rust))) @@ -1362,7 +1365,6 @@ move around." (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) `(modify-phases ,phases - (delete 'check) (add-after 'override-jemalloc 'enable-wasm32-unknown-unknown (lambda* (#:key inputs #:allow-other-keys) (substitute* "config.toml" @@ -1381,8 +1383,10 @@ move around." (inherit (package-source base-rust)) (patches (search-patches "rust-1.45-linker-locale.patch")))) (inputs - (alist-replace "llvm" (list llvm-10) - (package-inputs base-rust))) + (alist-replace + "lld" (list lld-9) + (alist-replace "llvm" (list llvm-10) + (package-inputs base-rust)))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) -- 2.28.0