diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-11 22:38:24 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-11 22:38:24 +0100 |
| commit | b7bf02a418e946b610ef68e8c5131f2350835956 (patch) | |
| tree | 6d84387279b9870dc0b151bb9d3dce7f9d9de73d /gnu/bootloader | |
| parent | 233c1be0a30846f6646b1f4edc6257037d0835fc (diff) | |
| parent | 13efb24850bc40fab2448771c87c77c9a69fc231 (diff) | |
| download | guix-patches-b7bf02a418e946b610ef68e8c5131f2350835956.tar guix-patches-b7bf02a418e946b610ef68e8c5131f2350835956.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/extlinux.scm | 4 | ||||
| -rw-r--r-- | gnu/bootloader/grub.scm | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 40108584a8..5b4dd84965 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -74,7 +74,9 @@ TIMEOUT ~a~%" (format port "~%")) #~()))))) - (computed-file "extlinux.conf" builder)) + (computed-file "extlinux.conf" builder + #:options '(#:local-build? #t + #:substitutable? #f))) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index fd62f627a0..f13685ac9d 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> @@ -28,7 +28,7 @@ #:use-module (gnu system uuid) #:use-module (gnu system file-systems) #:use-module (gnu system keyboard) - #:autoload (gnu packages bootloaders) (grub) + #:use-module (gnu packages bootloaders) #:autoload (gnu packages gtk) (guile-cairo guile-rsvg) #:autoload (gnu packages xorg) (xkeyboard-config) #:use-module (ice-9 match) @@ -392,7 +392,11 @@ if [ \"${grub_platform}\" == efi ]; then } fi~%")))) - (computed-file "grub.cfg" builder)) + ;; Since this file is rather unique, there's no point in trying to + ;; substitute it. + (computed-file "grub.cfg" builder + #:options '(#:local-build? #t + #:substitutable? #f))) |