branch master updated: bootloader/grub: Create grub background image with ungrafted inputs.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1b1b304011 bootloader/grub: Create grub background image with 
ungrafted inputs.
1b1b304011 is described below

commit 1b1b3040119e081065fc05dbf41b0a22538cdbed
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Fri Jan 24 10:36:16 2025 +0200

    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
---
 gnu/bootloader/grub.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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.