[PATCH] gnu: readymedia: Add coreutils to dependencies.

  • Done
  • quality assurance status badge
Details
2 participants
  • Fabio Natali
  • Zheng Junjie
Owner
unassigned
Submitted by
Fabio Natali
Severity
normal
F
F
Fabio Natali wrote on 28 Jul 17:20 +0200
(address . guix-patches@gnu.org)(name . Fabio Natali)(address . me@fabionatali.com)
9b857352fd100cf73aef76cd4a2e82333301d31c.1722177963.git.me@fabionatali.com
* gnu/packages/upnp.scm (readymedia)[inputs]: Add coreutils.

Change-Id: I8f73802bd0d8fecbf5ee20853eccefc2eef82411
---
Hi,

This is to add coreutils to ReadyMedia/MiniDLNA's dependencies. Without
coreutils (and the 'rm' command in particular) some ReadyMedia operations would
otherwise fail.

Thanks, cheers, Fabio.

gnu/packages/upnp.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

Toggle diff (37 lines)
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index aab68a6414..17605d3b96 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -26,6 +26,7 @@
(define-module (gnu packages upnp)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
@@ -154,12 +155,17 @@ (define-public readymedia
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile.am"
- ((".*LIBAVUTIL_LIBS.*") "")))))))
+ ((".*LIBAVUTIL_LIBS.*") ""))
+ (substitute* "minidlna.c"
+ (("rm -rf")
+ (string-append
+ (assoc-ref inputs "coreutils") "/bin/rm -rf"))))))))
(native-inputs (list autoconf automake gettext-minimal))
(inputs
- (list ffmpeg
+ (list coreutils
+ ffmpeg
flac
libexif
libid3tag

base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a
--
2.45.2
Z
Z
Zheng Junjie wrote on 30 Jul 07:17 +0200
(name . Fabio Natali via Guix-patches via)(address . guix-patches@gnu.org)
87ttg7zcep.fsf@iscas.ac.cn
Fabio Natali via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (41 lines)
> * gnu/packages/upnp.scm (readymedia)[inputs]: Add coreutils.
>
> Change-Id: I8f73802bd0d8fecbf5ee20853eccefc2eef82411
> ---
> Hi,
>
> This is to add coreutils to ReadyMedia/MiniDLNA's dependencies. Without
> coreutils (and the 'rm' command in particular) some ReadyMedia operations would
> otherwise fail.
>
> Thanks, cheers, Fabio.
>
> gnu/packages/upnp.scm | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
> index aab68a6414..17605d3b96 100644
> --- a/gnu/packages/upnp.scm
> +++ b/gnu/packages/upnp.scm
> @@ -26,6 +26,7 @@
> (define-module (gnu packages upnp)
> #:use-module (gnu packages)
> #:use-module (gnu packages autotools)
> + #:use-module (gnu packages base)
> #:use-module (gnu packages check)
> #:use-module (gnu packages compression)
> #:use-module (gnu packages curl)
> @@ -154,12 +155,17 @@ (define-public readymedia
> #:phases
> (modify-phases %standard-phases
> (add-after 'unpack 'patch-source
> - (lambda _
> + (lambda* (#:key inputs #:allow-other-keys)
> (substitute* "Makefile.am"
> - ((".*LIBAVUTIL_LIBS.*") "")))))))
> + ((".*LIBAVUTIL_LIBS.*") ""))
> + (substitute* "minidlna.c"
> + (("rm -rf")
> + (string-append
> + (assoc-ref inputs "coreutils") "/bin/rm -rf"))))))))

use (string-append (search-input-file inputs "/bin/rm") " -rf")

Toggle quote (5 lines)
> (native-inputs (list autoconf automake gettext-minimal))
> (inputs
> - (list ffmpeg
> + (list coreutils

please use coreutils-minimal

Toggle quote (6 lines)
> + ffmpeg
> flac
> libexif
> libid3tag
>
> base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmaod24ACgkQO1qpk+Gi
3/B8mA//VtuEVWsohPGgRPWQRBZ4201GtLjv666iO+e5pmOJtmRO/Lwz69WV+kPQ
CLpYw4OlZ/LaNQdPwjHSIbq/MU0/V1imSGBlQ5xPRoDQg/MQqQYbCtl+xYknTPZY
BViKu3cidGkeQV/lqjwPGdur4BT8hih1CgZPRjlm4UDK8EzCAEuCEgO31LbH+6uj
DiqcwbclVC6X6ilbmwiXlmXgaFCwmRc6ok7JBaqcGYjIhU4wCv0wPU52oeqgnFHK
lD6l8n0lQFF1LyI6LnZP/uBG5VQ+RTqeU2iY73ljjwAe4y3W/VLUd8wfPk2pdfRi
15WDdjbthXqpreSL7l/JbFBsFX4lPf7pY8lVCIfXtNpZQdgo5YyqQ/5xdc9QLZ1e
jondIgkVdvKmB2WM6/h7Ti9DHPPwpxTVpDUjnss0upNibYyHQmMxVFWbUfVXAKH2
s+6ACA3xCKWyZj/kIqHHFmLrFJfhyGrS8IlaxDPMuEsudeLlAGMmG0tgLK2Qloxj
9lohv1bksUt6ke9vNxHYptgc++r10HXh7zRO+DgklrS+dV4sG9Fa+X9L9zJtfx99
xvjypRjA7r/S9NKCnKCcm5tJ//F8Z8pnOLAKTUaUP7UH0C4pBTbWD3QVynNNyXrk
+3ECOk090lwM4NCna9/rGxSDJORjSD8+RwrTtUCoW++B9QAsfHU=
=/TF8
-----END PGP SIGNATURE-----

F
F
Fabio Natali wrote on 30 Jul 12:58 +0200
[PATCH] gnu: readymedia: Add coreutils to dependencies.
(address . 72338@debbugs.gnu.org)
e5efe2bcb63d408f2dd50bc1ac298de164e40a8b.1722336973.git.me@fabionatali.com
* gnu/packages/upnp.scm (readymedia)[inputs]: Add coreutils.

Change-Id: I8f73802bd0d8fecbf5ee20853eccefc2eef82411
---
Hi Zheng,

Thanks for reviewing my patch. Please find below an updated version. Let me know
should you spot anything else. ?

Thanks, cheers, Fabio.

gnu/packages/upnp.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

Toggle diff (37 lines)
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index aab68a6414..d85e1da956 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -26,6 +26,7 @@
(define-module (gnu packages upnp)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
@@ -154,12 +155,17 @@ (define-public readymedia
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile.am"
- ((".*LIBAVUTIL_LIBS.*") "")))))))
+ ((".*LIBAVUTIL_LIBS.*") ""))
+ (substitute* "minidlna.c"
+ (("rm -rf")
+ (string-append
+ (search-input-file inputs "/bin/rm") " -rf"))))))))
(native-inputs (list autoconf automake gettext-minimal))
(inputs
- (list ffmpeg
+ (list coreutils-minimal
+ ffmpeg
flac
libexif
libid3tag

base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a
--
2.45.2
Z
(name . Fabio Natali via Guix-patches via)(address . guix-patches@gnu.org)
87ttg4w849.fsf@iscas.ac.cn
Fabio Natali via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (50 lines)
> * gnu/packages/upnp.scm (readymedia)[inputs]: Add coreutils.
>
> Change-Id: I8f73802bd0d8fecbf5ee20853eccefc2eef82411
> ---
> Hi Zheng,
>
> Thanks for reviewing my patch. Please find below an updated version. Let me know
> should you spot anything else. ?
>
> Thanks, cheers, Fabio.
>
> gnu/packages/upnp.scm | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
> index aab68a6414..d85e1da956 100644
> --- a/gnu/packages/upnp.scm
> +++ b/gnu/packages/upnp.scm
> @@ -26,6 +26,7 @@
> (define-module (gnu packages upnp)
> #:use-module (gnu packages)
> #:use-module (gnu packages autotools)
> + #:use-module (gnu packages base)
> #:use-module (gnu packages check)
> #:use-module (gnu packages compression)
> #:use-module (gnu packages curl)
> @@ -154,12 +155,17 @@ (define-public readymedia
> #:phases
> (modify-phases %standard-phases
> (add-after 'unpack 'patch-source
> - (lambda _
> + (lambda* (#:key inputs #:allow-other-keys)
> (substitute* "Makefile.am"
> - ((".*LIBAVUTIL_LIBS.*") "")))))))
> + ((".*LIBAVUTIL_LIBS.*") ""))
> + (substitute* "minidlna.c"
> + (("rm -rf")
> + (string-append
> + (search-input-file inputs "/bin/rm") " -rf"))))))))
> (native-inputs (list autoconf automake gettext-minimal))
> (inputs
> - (list ffmpeg
> + (list coreutils-minimal
> + ffmpeg
> flac
> libexif
> libid3tag
>
> base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a

Thanks, push, close.
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmarr+YACgkQO1qpk+Gi
3/AnEw//W6THCk8RA0m8sejYBIZ5nPBXdIkyx8ttnpKBl4TmhBBigLcZZ84K+Eaa
xVjzT1WrY/quXQin0JUzN59Seo8CvWeH2HwA0UIelklLcFm6weqbC95hfnpC9NAn
TlsIb1dvmS/V7dPV9nlV65G2+q7D7TTw5ru5X0Oq3rnU4yTSOJR3UjUEIyffubms
dL5zLjxPDdU1amenlU0RBiswnecJiIHa/eVyDayRMQJqFQQUTh8oBSa+kQvg3Zd4
Amz5NRD2AeuIpCd942GGZVshK6Xe8BnY7V0Qm+SmD8sh23opvYOphy6nQgJV4un9
fPD747RdY+lFrWg/LAuJZ9rSz0W3cThJmeDwjiKwcv+DhpCwJgTc9FLrO6oqHSL6
n38f0V7081xezhO+PW+Q3SrxpJ8xKPaJq9RZ/A2MqfiteUoZaW9gJqarEYxhj7r2
CKFrH39R6AtxbcseMzLkvjh8cuHozcZssPMnjIgK5ipLCuKoA53nlYh+/xN+XXgz
w/XT3xN2Gkyp36NQ70M2inzE3VAKsNL6mPSYhSQ5BUOUZHWNsvJJRq0ODY0JWfda
OhO2L6sDBIdlcUBIohBJ2KhoVsPUgydv9Ee2gWT6MMvr3XLJjUAW1LxWs6/mfVse
+VXzMjVDNPVOjPb+UWmWKjgEBVSMlPhVXoV5HtvCAy0cvXaMddc=
=TNe0
-----END PGP SIGNATURE-----

Closed
F
F
Fabio Natali wrote on 1 Aug 18:54 +0200
(address . 72338-done@debbugs.gnu.org)
871q38yyiv.fsf@fabionatali.com
On 2024-08-01, 23:55 +0800, Z572 <zhengjunjie@iscas.ac.cn> wrote:
Toggle quote (2 lines)
> Thanks, push, close.

This is brilliant! Thanks Zheng, much appreciated. Cheers, Fabio.
?
Your comment

This issue is archived.

To comment on this conversation send an email to 72338@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 72338
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch