diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /doc/environment-gdb.scm | |
parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in: gnu/local.mk gnu/packages/databases.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/machine-learning.scm gnu/packages/networking.scm gnu/packages/polkit.scm gnu/packages/pulseaudio.scm gnu/packages/rpc.scm gnu/packages/rust.scm gnu/packages/version-control.scm gnu/packages/w3m.scm
Diffstat (limited to 'doc/environment-gdb.scm')
-rw-r--r-- | doc/environment-gdb.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/environment-gdb.scm b/doc/environment-gdb.scm index 040a8637f8..0534e594de 100644 --- a/doc/environment-gdb.scm +++ b/doc/environment-gdb.scm @@ -6,8 +6,7 @@ ;; Augment the package definition of GDB with the build tools ;; needed when developing GDB (and which are not needed when ;; simply installing it.) -(package (inherit gdb) - (native-inputs `(("autoconf" ,autoconf-2.64) - ("automake" ,automake) - ("texinfo" ,texinfo) - ,@(package-native-inputs gdb)))) +(package + (inherit gdb) + (native-inputs (modify-inputs (package-native-inputs gdb) + (prepend autoconf-2.64 automake texinfo)))) |