diff options
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/grub.scm | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index eca6d97b197..e90a6a11eb2 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm | |||
| @@ -121,25 +121,21 @@ otherwise." | |||
| 121 | 121 | ||
| 122 | (define* (svg->png svg #:key width height) | 122 | (define* (svg->png svg #:key width height) |
| 123 | "Build a PNG of HEIGHT x WIDTH from SVG." | 123 | "Build a PNG of HEIGHT x WIDTH from SVG." |
| 124 | ;; Note: Guile-RSVG & co. are now built for Guile 2.2, so we use 2.2 here. | 124 | (gexp->derivation "grub-image.png" |
| 125 | ;; TODO: Remove #:guile-for-build when 2.2 has become the default. | 125 | (with-imported-modules '((gnu build svg)) |
| 126 | (mlet %store-monad ((guile (package->derivation guile-2.2 #:graft? #f))) | 126 | #~(begin |
| 127 | (gexp->derivation "grub-image.png" | 127 | ;; We need these two libraries. |
| 128 | (with-imported-modules '((gnu build svg)) | 128 | (add-to-load-path (string-append #+guile-rsvg |
| 129 | #~(begin | 129 | "/share/guile/site/" |
| 130 | ;; We need these two libraries. | 130 | (effective-version))) |
| 131 | (add-to-load-path (string-append #+guile-rsvg | 131 | (add-to-load-path (string-append #+guile-cairo |
| 132 | "/share/guile/site/" | 132 | "/share/guile/site/" |
| 133 | (effective-version))) | 133 | (effective-version))) |
| 134 | (add-to-load-path (string-append #+guile-cairo | 134 | |
| 135 | "/share/guile/site/" | 135 | (use-modules (gnu build svg)) |
| 136 | (effective-version))) | 136 | (svg->png #+svg #$output |
| 137 | 137 | #:width #$width | |
| 138 | (use-modules (gnu build svg)) | 138 | #:height #$height))))) |
| 139 | (svg->png #+svg #$output | ||
| 140 | #:width #$width | ||
| 141 | #:height #$height))) | ||
| 142 | #:guile-for-build guile))) | ||
| 143 | 139 | ||
| 144 | (define* (grub-background-image config #:key (width 1024) (height 768)) | 140 | (define* (grub-background-image config #:key (width 1024) (height 768)) |
| 145 | "Return the GRUB background image defined in CONFIG with a ratio of | 141 | "Return the GRUB background image defined in CONFIG with a ratio of |
