diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
| commit | da77ea23daa0bfa4a73290dff99b22d6825ff80b (patch) | |
| tree | 748d24e62b93c8ab8f999d6415d9f65c3d317da2 /gnu/packages/bootloaders.scm | |
| parent | 4eeb6922449285f9bce615f6e4ffe4375fa0233f (diff) | |
| parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
| download | guix-da77ea23daa0bfa4a73290dff99b22d6825ff80b.tar guix-da77ea23daa0bfa4a73290dff99b22d6825ff80b.tar.gz | |
Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt
Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/llvm.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b22df415e8..6c8bb068c3 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016-2018, 2021-2023 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch> -;;; Copyright © 2017, 2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018, 2020-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 nee <nee@cock.li> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> @@ -1130,7 +1130,7 @@ removed so that it fits within common partitioning schemes."))) (add-after 'unpack 'set-environment (lambda* (#:key native-inputs inputs #:allow-other-keys) (setenv "SCP" (search-input-file - native-inputs "libexec/scp.bin")) + (or native-inputs inputs) "libexec/scp.bin")) (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) (native-inputs (modify-inputs (package-native-inputs base) |