* [bug#28974] [PATCH 1/1] gnu: syslinux: Propagate mtools as syslinux needs it at runtime.
@ 2017-10-24 18:59 Adam Van Ymeren
2017-10-26 5:09 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Adam Van Ymeren @ 2017-10-24 18:59 UTC (permalink / raw)
To: 28974
When trying to install syslinux to a FAT partition, it requires the
mtools (particularly mcopy) to be available at runtime in PATH.
---
gnu/packages/bootloaders.scm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 613537a5d..b747ca579 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -44,6 +44,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages virtualization)
+ #:use-module (gnu packages mtools)
#:use-module (guix build-system gnu)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -237,6 +238,8 @@ menu to select one of the installed operating systems.")
("python-2" ,python-2)))
(inputs
`(("libuuid" ,util-linux)))
+ (propagated-inputs
+ `(("mtools" ,mtools)))
(arguments
`(#:parallel-build? #f
#:make-flags
--
2.14.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#28974] [PATCH 1/1] gnu: syslinux: Propagate mtools as syslinux needs it at runtime.
2017-10-24 18:59 [bug#28974] [PATCH 1/1] gnu: syslinux: Propagate mtools as syslinux needs it at runtime Adam Van Ymeren
@ 2017-10-26 5:09 ` Ludovic Courtès
2017-11-16 9:45 ` bug#28974: " Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2017-10-26 5:09 UTC (permalink / raw)
To: Adam Van Ymeren; +Cc: 28974
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
Hi Adam,
Adam Van Ymeren <adam@vany.ca> skribis:
> When trying to install syslinux to a FAT partition, it requires the
> mtools (particularly mcopy) to be available at runtime in PATH.
[...]
> + (propagated-inputs
> + `(("mtools" ,mtools)))
A quick inspection showed uses of “mcopy” and “mattrib”. To avoid
propagating mtools, I propose the patch below.
Could you check if it works for you?
Thank you,
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1388 bytes --]
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 613537a5d..b4372748c 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -236,7 +236,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
@@ -251,11 +252,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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#28974: [PATCH 1/1] gnu: syslinux: Propagate mtools as syslinux needs it at runtime.
2017-10-26 5:09 ` Ludovic Courtès
@ 2017-11-16 9:45 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2017-11-16 9:45 UTC (permalink / raw)
To: Adam Van Ymeren; +Cc: 28974-done
Hi Adam,
ludo@gnu.org (Ludovic Courtès) skribis:
> Adam Van Ymeren <adam@vany.ca> skribis:
>
>> When trying to install syslinux to a FAT partition, it requires the
>> mtools (particularly mcopy) to be available at runtime in PATH.
>
> [...]
>
>> + (propagated-inputs
>> + `(("mtools" ,mtools)))
>
> A quick inspection showed uses of “mcopy” and “mattrib”. To avoid
> propagating mtools, I propose the patch below.
>
> Could you check if it works for you?
It LGTM so I pushed it as 0b4dbb401cd94cd04eab3a25f80cbb3fcd3d1daf.
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-16 9:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-24 18:59 [bug#28974] [PATCH 1/1] gnu: syslinux: Propagate mtools as syslinux needs it at runtime Adam Van Ymeren
2017-10-26 5:09 ` Ludovic Courtès
2017-11-16 9:45 ` bug#28974: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).