diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-02-24 21:25:52 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-24 21:25:52 +0100 |
commit | aa51eb2073f17e40d660d0beaeb7b1b78aa9e1cc (patch) | |
tree | 5ccb7f83712c4400176a344e537b5fcbbb7047aa /gnu/packages/rust.scm | |
parent | 1b9eb93a5dd1e90291b614311cd1fb2051e72718 (diff) | |
parent | 6eb35d4a780d37b809a6c8c1794ff227da2fa29d (diff) | |
download | patches-aa51eb2073f17e40d660d0beaeb7b1b78aa9e1cc.tar patches-aa51eb2073f17e40d660d0beaeb7b1b78aa9e1cc.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/rust.scm')
-rw-r--r-- | gnu/packages/rust.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6b95e20134..5afdf13f43 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -764,7 +764,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (inherit base-rust) (inputs ;; Use LLVM 6.0 - (alist-replace "llvm" (list llvm) + (alist-replace "llvm" (list llvm-6) (package-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) |