aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2025-01-24 10:36:16 +0200
committerEfraim Flashner <efraim@flashner.co.il>2025-01-26 09:32:59 +0200
commit1b1b3040119e081065fc05dbf41b0a22538cdbed (patch)
tree25ecd58805882b3e9c6cad64e30a92f9a87c8158
parent2bc34aca3c92b37e8140d7c95e6252fd2d091869 (diff)
downloadguix-1b1b3040119e081065fc05dbf41b0a22538cdbed.tar.gz
guix-1b1b3040119e081065fc05dbf41b0a22538cdbed.zip
bootloader/grub: Create grub background image with ungrafted inputs.
This fixes bug https://issues.guix.gnu.org/75510. * gnu/bootloader/grub.scm (image->png): Create the grub-image using ungrafted inputs. Change-Id: Ia23dd081d9711c703b7bf795dc376e024bb5caff
-rw-r--r--gnu/bootloader/grub.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index c2462d5d03..e136482c54 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -140,7 +140,12 @@ Otherwise the picture in IMAGE is just copied."
(svg->png #+image #$output
#:width #$width
#:height #$height))
- (copy-file #+image #$output))))))
+ (copy-file #+image #$output))))
+ ;; Work around a bug in grafts where different versions of
+ ;; guile-cairo are loaded from (gnu build svg).
+ ;; As seen in https://issues.guix.gnu.org/47115#23 and
+ ;; in https://issues.guix.gnu.org/75510.
+ #:options '(#:graft? #f)))
(define* (grub-background-image config)
"Return the GRUB background image defined in CONFIG or #f if none was found.