From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49048)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e7aQf-0000Us-C6
	for guix-patches@gnu.org; Thu, 26 Oct 2017 01:10:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e7aQc-0002eM-68
	for guix-patches@gnu.org; Thu, 26 Oct 2017 01:10:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:53403)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1e7aQc-0002eA-1Y
	for guix-patches@gnu.org; Thu, 26 Oct 2017 01:10:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e7aQb-0001k8-OC
	for guix-patches@gnu.org; Thu, 26 Oct 2017 01:10:01 -0400
Subject: [bug#28974] [PATCH 1/1] gnu: syslinux: Propagate mtools as syslinux
	needs it at runtime.
Resent-Message-ID: <handler.28974.B28974.15089945696647@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <87mv4gbcd1.fsf@vany.ca>
Date: Wed, 25 Oct 2017 22:09:22 -0700
In-Reply-To: <87mv4gbcd1.fsf@vany.ca> (Adam Van Ymeren's message of "Tue, 24
	Oct 2017 14:59:54 -0400")
Message-ID: <871slqjy0t.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Adam Van Ymeren <adam@vany.ca>
Cc: 28974@debbugs.gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

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 =E2=80=9Cmcopy=E2=80=9D and =E2=80=9Cmatt=
rib=E2=80=9D.  To avoid
propagating mtools, I propose the patch below.

Could you check if it works for you?

Thank you,
Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

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

--=-=-=--