From 0b4dbb401cd94cd04eab3a25f80cbb3fcd3d1daf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Nov 2017 10:41:04 +0100 Subject: gnu: syslinux: Add explicit dependency on mtools. Suggested by Adam Van Ymeren at . * 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(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f988dbc678..20f38b2d0d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -237,7 +237,8 @@ (define-public syslinux ("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 @@ (define-public syslinux #: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 -- cgit v1.2.3