summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-07-02 23:26:46 +0200
committerMarius Bakke <marius@gnu.org>2020-07-02 23:30:21 +0200
commit5e6d583954b8ca9c4ab2eed3347a92a3ad7ad6fb (patch)
tree0fa33650762c2a7b1451b4a08cbf94338abc34c8 /gnu/packages
parent6a3ae2eec7c7ea06499e70343884ce576e2c29f8 (diff)
gnu: gdb@8.2: Inherit from the 'full' gdb.
This reverts commit c007d868686fc2f9bf02a34150d4f0ac72b1f8d2, because later versions of Rust requires loading Python plugins. * gnu/packages/gdb.scm (gdb-minimal-8.2): Rename to ... (gdb-8.2): ... this. Adjust inheritance accordingly. * gnu/packages/rust.scm (rust-1.27)[native-inputs]: Adjust accordingly.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/gdb.scm4
-rw-r--r--gnu/packages/rust.scm2
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index f2f272cc90..b836228506 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -131,9 +131,9 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
;; This version of GDB is required by some of the Rust compilers, see
;; <https://bugs.gnu.org/37810>.
-(define-public gdb-minimal-8.2
+(define-public gdb-8.2
(package
- (inherit gdb-minimal)
+ (inherit gdb)
(version "8.2.1")
(source (origin
(method url-fetch)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index fe43e72421..b084a6df9e 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -828,7 +828,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
(native-inputs
;; FIXME: Rust 1.27 and some later versions require GDB 8.2 specifically.
;; See <https://bugs.gnu.org/37810>.
- (alist-replace "gdb" (list gdb-minimal-8.2)
+ (alist-replace "gdb" (list gdb-8.2)
(package-native-inputs base-rust)))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)