[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: gnu: syslinux: Add explicit dependency on mtools.
From: |
Ludovic Courtès |
Subject: |
06/06: gnu: syslinux: Add explicit dependency on mtools. |
Date: |
Thu, 16 Nov 2017 04:44:16 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 0b4dbb401cd94cd04eab3a25f80cbb3fcd3d1daf
Author: Ludovic Courtès <address@hidden>
Date: Thu Nov 16 10:41:04 2017 +0100
gnu: syslinux: Add explicit dependency on mtools.
Suggested by Adam Van Ymeren <address@hidden>
at <https://bugs.gnu.org/28974>.
* gnu/packages/bootloaders.scm (syslinux)[inputs]: Add MTOOLS.
[ARGUMENTS]: In 'patch-files' phase, patch references to 'mcopy' and
'mattrib'.
---
gnu/packages/bootloaders.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index f988dbc..20f38b2 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -237,7 +237,8 @@ menu to select one of the installed operating systems.")
("perl" ,perl)
("python-2" ,python-2)))
(inputs
- `(("libuuid" ,util-linux)))
+ `(("libuuid" ,util-linux)
+ ("mtools" ,mtools)))
(arguments
`(#:parallel-build? #f
#:make-flags
@@ -252,11 +253,17 @@ menu to select one of the installed operating systems.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-files
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "." "Makefile.*|ppmtolss16")
(("/bin/pwd") (which "pwd"))
(("/bin/echo") (which "echo"))
(("/usr/bin/perl") (which "perl")))
+ (let ((mtools (assoc-ref inputs "mtools")))
+ (substitute* (find-files "." "\\.c$")
+ (("mcopy")
+ (string-append mtools "/bin/mcopy"))
+ (("mattrib")
+ (string-append mtools "/bin/mattrib"))))
#t))
(delete 'configure)
(add-before 'build 'set-permissions
- branch master updated (304a53f -> 0b4dbb4), Ludovic Courtès, 2017/11/16
- 04/06: gnu: spectrwm: Update to 3.1.0., Ludovic Courtès, 2017/11/16
- 06/06: gnu: syslinux: Add explicit dependency on mtools.,
Ludovic Courtès <=
- 03/06: gnu: xpra: Fix paths., Ludovic Courtès, 2017/11/16
- 05/06: gnu: wget: Add wget2., Ludovic Courtès, 2017/11/16
- 01/06: gnu: messaging: Add libsignal-protocol-c., Ludovic Courtès, 2017/11/16
- 02/06: gnu: messaging: Enable OMEMO for dino., Ludovic Courtès, 2017/11/16