diff options
| author | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-07-10 14:37:53 -0400 |
| commit | c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d (patch) | |
| tree | 3a2e569e333ccd9265237868d3f46b2d1e04e3a9 /gnu/bootloader/grub.scm | |
| parent | ad22c7185395a52bd90ea5890a2ac79f44d00352 (diff) | |
| parent | 61adfb00b11cc16a70e60f19fd8e0a838a3ef608 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/bootloader/grub.scm')
| -rw-r--r-- | gnu/bootloader/grub.scm | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index f1cc3324db..880491c983 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -34,6 +34,7 @@ #:autoload (gnu packages bootloaders) (grub) #:autoload (gnu packages compression) (gzip) #:autoload (gnu packages gtk) (guile-cairo guile-rsvg) + #:autoload (gnu packages guile) (guile-2.2) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) @@ -118,21 +119,25 @@ otherwise." (define* (svg->png svg #:key width height) "Build a PNG of HEIGHT x WIDTH from SVG." - (gexp->derivation "grub-image.png" - (with-imported-modules '((gnu build svg)) - #~(begin - ;; We need these two libraries. - (add-to-load-path (string-append #+guile-rsvg - "/share/guile/site/" - (effective-version))) - (add-to-load-path (string-append #+guile-cairo - "/share/guile/site/" - (effective-version))) - - (use-modules (gnu build svg)) - (svg->png #+svg #$output - #:width #$width - #:height #$height))))) + ;; Note: Guile-RSVG & co. are now built for Guile 2.2, so we use 2.2 here. + ;; TODO: Remove #:guile-for-build when 2.2 has become the default. + (mlet %store-monad ((guile (package->derivation guile-2.2 #:graft? #f))) + (gexp->derivation "grub-image.png" + (with-imported-modules '((gnu build svg)) + #~(begin + ;; We need these two libraries. + (add-to-load-path (string-append #+guile-rsvg + "/share/guile/site/" + (effective-version))) + (add-to-load-path (string-append #+guile-cairo + "/share/guile/site/" + (effective-version))) + + (use-modules (gnu build svg)) + (svg->png #+svg #$output + #:width #$width + #:height #$height))) + #:guile-for-build guile))) (define* (grub-background-image config #:key (width 1024) (height 768)) "Return the GRUB background image defined in CONFIG with a ratio of |