[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/13: bootloader: grub: Simplify 'svg->png'.
From: |
Ludovic Courtès |
Subject: |
06/13: bootloader: grub: Simplify 'svg->png'. |
Date: |
Fri, 1 Jun 2018 09:38:32 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 31a5d694a3b9200bfde253eafbaca118b773fb96
Author: Ludovic Courtès <address@hidden>
Date: Mon May 28 18:27:07 2018 +0200
bootloader: grub: Simplify 'svg->png'.
* gnu/bootloader/grub.scm (svg->png): Remove now unneeded
#:guile-for-build argument.
---
gnu/bootloader/grub.scm | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index eca6d97..e90a6a1 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -121,25 +121,21 @@ otherwise."
(define* (svg->png svg #:key width height)
"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.
- ;; 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)))
+ (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)))))
(define* (grub-background-image config #:key (width 1024) (height 768))
"Return the GRUB background image defined in CONFIG with a ratio of
- branch master updated (5d66988 -> bf5bf57), Ludovic Courtès, 2018/06/01
- 02/13: pack: Adjust test to expect relative symlinks., Ludovic Courtès, 2018/06/01
- 01/13: tests: Fix arguments in pack test., Ludovic Courtès, 2018/06/01
- 06/13: bootloader: grub: Simplify 'svg->png'.,
Ludovic Courtès <=
- 12/13: database: 'register-path' resets timestamps., Ludovic Courtès, 2018/06/01
- 05/13: tests: ssh: Use 'with-extensions'., Ludovic Courtès, 2018/06/01
- 13/13: Add (guix store deduplication)., Ludovic Courtès, 2018/06/01
- 07/13: bootloader: grub: Use 'with-extensions'., Ludovic Courtès, 2018/06/01
- 10/13: build: Check for Guile-SQLite3., Ludovic Courtès, 2018/06/01
- 08/13: profiles: Use 'with-extensions'., Ludovic Courtès, 2018/06/01
- 03/13: gexp: Add 'with-extensions'., Ludovic Courtès, 2018/06/01
- 09/13: vm: Use 'with-extensions'., Ludovic Courtès, 2018/06/01
- 04/13: pack: Use 'with-extensions' when referring to (guix docker)., Ludovic Courtès, 2018/06/01
- 11/13: Add (gnu store database)., Ludovic Courtès, 2018/06/01