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/efi.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/efi.scm')
| -rw-r--r-- | gnu/packages/efi.scm | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 8bbd873435..4625538d26 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -143,12 +143,12 @@ information.") (setenv "CC" "gcc") #t))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bash" ,bash) - ("help2man" ,help2man) - ("pkg-config" ,pkg-config) - ("util-linux" ,util-linux))) ; getopt + (list autoconf + automake + bash + help2man + pkg-config + util-linux)) ; getopt (inputs `(("gnu-efi" ,gnu-efi) ("libuuid" ,util-linux "lib") @@ -202,13 +202,9 @@ information.") #t)) (delete 'configure)))) (native-inputs - `(("help2man" ,help2man) - ("perl" ,perl) - ("perl-file-slurp" ,perl-file-slurp) - ("sbsigntools" ,sbsigntools))) + (list help2man perl perl-file-slurp sbsigntools)) (inputs - `(("gnu-efi" ,gnu-efi) - ("openssl" ,openssl))) + (list gnu-efi openssl)) (synopsis "EFI tools (key management, variable management)") (description "This package provides EFI tools for EFI key management and EFI variable management.") @@ -257,7 +253,7 @@ and EFI variable management.") "/libexec")) #t))))) (inputs - `(("gnu-efi" ,gnu-efi))) + (list gnu-efi)) (synopsis "Minimal Linux loader for UEFI") (description "This package provides a minimal Linux loader as an UEFI program.") |