nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootloader: grub: Simplify 'svg->png'. 

* gnu/bootloader/grub.scm (svg->png): Remove now unneeded
  #:guile-for-build argument.
This commit is contained in:
Ludovic Courtès 2018-05-28 18:27:07 +02:00
parent ff913cf514
commit 31a5d694a3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/bootloader/grub.scm
View File

@ -121,25 +121,21 @@ otherwise."
(define* (svg->png svg #:key width height) (define* (svg->png svg #:key width height)
"Build a PNG of HEIGHT x WIDTH from SVG." "Build a PNG of HEIGHT x WIDTH from SVG."
;; Note: Guile-RSVG & co. are now built for Guile 2.2, so we use 2.2 here. (gexp->derivation "grub-image.png"
;; TODO: Remove #:guile-for-build when 2.2 has become the default. (with-imported-modules '((gnu build svg))
(mlet %store-monad ((guile (package->derivation guile-2.2 #:graft? #f))) #~(begin
(gexp->derivation "grub-image.png" ;; We need these two libraries.
(with-imported-modules '((gnu build svg)) (add-to-load-path (string-append #+guile-rsvg
#~(begin "/share/guile/site/"
;; We need these two libraries. (effective-version)))
(add-to-load-path (string-append #+guile-rsvg (add-to-load-path (string-append #+guile-cairo
"/share/guile/site/" "/share/guile/site/"
(effective-version))) (effective-version)))
(add-to-load-path (string-append #+guile-cairo
"/share/guile/site/"
(effective-version)))
(use-modules (gnu build svg)) (use-modules (gnu build svg))
(svg->png #+svg #$output (svg->png #+svg #$output
#:width #$width #:width #$width
#:height #$height))) #:height #$height)))))
#:guile-for-build guile)))
(define* (grub-background-image config #:key (width 1024) (height 768)) (define* (grub-background-image config #:key (width 1024) (height 768))
"Return the GRUB background image defined in CONFIG with a ratio of "Return the GRUB background image defined in CONFIG with a ratio of