ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gdb@8.2: Inherit from 'gdb-minimal'.

Browse source 
* gnu/packages/gdb.scm (gdb-minimal): Move definition up.
(gdb-8.2): Rename to ...
(gdb-minimal-8.2): ... this.  Inherit from GDB-MINIMAL.
* gnu/packages/rust.scm (rust-1.27)[native-inputs]: Adjust for the rename.
This commit is contained in:
Marius Bakke 2020-06-27 12:34:48 +02:00
parent a3997b83ff
commit c007d86868
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/gdb.scm
View file

@ -122,11 +122,18 @@ (define-public gdb
written in C, C++, Ada, Objective-C, Pascal and more.")
(license gpl3+)))
(define-public gdb-minimal
(package/inherit
gdb
(name "gdb-minimal")
(inputs (fold alist-delete (package-inputs gdb)
'("libxml2" "ncurses" "python-wrapper" "source-highlight")))))
;; This version of GDB is required by some of the Rust compilers, see
;; <https://bugs.gnu.org/37810>.
(define-public gdb-8.2
(define-public gdb-minimal-8.2
(package
(inherit gdb)
(inherit gdb-minimal)
(version "8.2.1")
(source (origin
(method url-fetch)
@ -135,10 +142,3 @@ (define-public gdb-8.2
(sha256
(base32
"00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))))
(define-public gdb-minimal
(package/inherit
gdb
(name "gdb-minimal")
(inputs (fold alist-delete (package-inputs gdb)
'("libxml2" "ncurses" "python-wrapper" "source-highlight")))))

2
gnu/packages/rust.scm
View file

@ -828,7 +828,7 @@ (define-public rust-1.27
(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-8.2)
(alist-replace "gdb" (list gdb-minimal-8.2)
(package-native-inputs base-rust)))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)