From fd1fde6041b7f221bed114593944365d21cb925c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Feb 2020 23:26:38 +0100 Subject: gnu: rust: Switch to 'C_INCLUDE_PATH'. * gnu/packages/rust.scm (rust-1.19)[native-search-paths]: Remove "CPATH" and add "C_INCLUDE_PATH" and "CPLUS_INCLUDE_PATH" instead. --- gnu/packages/rust.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8bed56ff72..97ba882553 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -413,8 +413,11 @@ test = { path = \"../libtest\" } ;; modules (see ). (native-search-paths (list (search-path-specification - (variable "CPATH") + (variable "C_INCLUDE_PATH") (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include/c++" "include"))) (search-path-specification (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) -- cgit v1.2.3 From 47cd0febe957b698cc2ae28978bdc3bc89e787f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Mar 2020 15:07:49 +0200 Subject: gnu: rust: Build with Make 4.2. Fixes . * gnu/packages/rust.scm (rust-1.20)[native-inputs]: Add GNU-MAKE-4.2. --- gnu/packages/rust.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6774603db6..5e5748f199 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -469,6 +469,10 @@ safety and thread safety guarantees.") (delete-file-recursively "src/llvm") #t)) (patches '()))) + (native-inputs + `(;; The tests fail with newer versions of GNU Make. + ("make" ,gnu-make-4.2) + ,@(package-native-inputs base-rust))) (outputs '("out" "doc" "cargo")) ;; Since rust-1.19 is local, it's quite probable that Hydra ;; will build rust-1.19 only as a dependency of rust-1.20. -- cgit v1.2.3