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 /gnu/packages/mercury.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
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 'gnu/packages/mercury.scm')
| -rw-r--r-- | gnu/packages/mercury.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm index 5a2c85a79b..fe02b34a97 100644 --- a/gnu/packages/mercury.scm +++ b/gnu/packages/mercury.scm @@ -244,8 +244,6 @@ separate compilation, and numerous optimization/time trade-offs.") ;; Eventually we need to add inputs for Java, Erlang, ;; C#, etc. in order to enable these extra grades. (native-inputs - `(("mercury-minimal" ,mercury-minimal) - ("autoconf" ,autoconf) - ("automake" ,automake) - ,@(package-native-inputs mercury-minimal))) + (modify-inputs (package-native-inputs mercury-minimal) + (prepend mercury-minimal autoconf automake))) (synopsis "Pure logic programming language"))) |