From 6ba3980e748099d9ee21abd246aeb86ed777744c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Jul 2020 23:27:14 +0200 Subject: [PATCH] gnu: Rust: Use gdb@8. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Remove GDB-MINIMAL. Add GDB-8.2. (rust-1.27)[native-inputs]: Remove. --- gnu/packages/rust.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b084a6df9e..9e753d6f99 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -420,7 +420,9 @@ (define rust-1.19 `(("bison" ,bison) ; For the tests ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests - ("gdb" ,gdb-minimal) ; For the tests + ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. + ;; See . Use it on all Rusts for simplicity. + ("gdb" ,gdb-8.2) ; For the tests ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rustc-bootstrap" ,mrustc) @@ -825,11 +827,6 @@ (define-public rust-1.27 "rust-bootstrap-stage0-test.patch" "rust-1.25-accept-more-detailed-gdb-lines.patch" "rust-reproducible-builds.patch"))))) - (native-inputs - ;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically. - ;; See . - (alist-replace "gdb" (list gdb-8.2) - (package-native-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases)