* [bug#72338] [PATCH] gnu: readymedia: Add coreutils to dependencies.
@ 2024-07-28 15:20 Fabio Natali via Guix-patches via
2024-07-30 5:17 ` Zheng Junjie
2024-07-30 10:58 ` Fabio Natali via Guix-patches via
0 siblings, 2 replies; 5+ messages in thread
From: Fabio Natali via Guix-patches via @ 2024-07-28 15:20 UTC (permalink / raw)
To: 72338; +Cc: Fabio Natali
* 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"))))))))
(native-inputs (list autoconf automake gettext-minimal))
(inputs
- (list ffmpeg
+ (list coreutils
+ ffmpeg
flac
libexif
libid3tag
base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a
--
2.45.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#72338] [PATCH] gnu: readymedia: Add coreutils to dependencies.
2024-07-28 15:20 [bug#72338] [PATCH] gnu: readymedia: Add coreutils to dependencies Fabio Natali via Guix-patches via
@ 2024-07-30 5:17 ` Zheng Junjie
2024-07-30 10:58 ` Fabio Natali via Guix-patches via
1 sibling, 0 replies; 5+ messages in thread
From: Zheng Junjie @ 2024-07-30 5:17 UTC (permalink / raw)
To: 72338; +Cc: me
[-- Attachment #1: Type: text/plain, Size: 1875 bytes --]
Fabio Natali via Guix-patches via <guix-patches@gnu.org> writes:
> * 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")
> (native-inputs (list autoconf automake gettext-minimal))
> (inputs
> - (list ffmpeg
> + (list coreutils
please use coreutils-minimal
> + ffmpeg
> flac
> libexif
> libid3tag
>
> base-commit: 46a64c7fdd057283063aae6df058579bb07c4b6a
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#72338] [PATCH] gnu: readymedia: Add coreutils to dependencies.
2024-07-28 15:20 [bug#72338] [PATCH] gnu: readymedia: Add coreutils to dependencies Fabio Natali via Guix-patches via
2024-07-30 5:17 ` Zheng Junjie
@ 2024-07-30 10:58 ` Fabio Natali via Guix-patches via
2024-08-01 15:55 ` bug#72338: " Z572
1 sibling, 1 reply; 5+ messages in thread
From: Fabio Natali via Guix-patches via @ 2024-07-30 10:58 UTC (permalink / raw)
To: 72338; +Cc: zhengjunjie, Fabio Natali
* 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
--
2.45.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#72338: [PATCH] gnu: readymedia: Add coreutils to dependencies.
2024-07-30 10:58 ` Fabio Natali via Guix-patches via
@ 2024-08-01 15:55 ` Z572
2024-08-01 16:54 ` [bug#72338] " Fabio Natali via Guix-patches via
0 siblings, 1 reply; 5+ messages in thread
From: Z572 @ 2024-08-01 15:55 UTC (permalink / raw)
To: Fabio Natali via Guix-patches via; +Cc: 72338-done, Fabio Natali
[-- Attachment #1: Type: text/plain, Size: 1813 bytes --]
Fabio Natali via Guix-patches via <guix-patches@gnu.org> writes:
> * 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#72338] [PATCH] gnu: readymedia: Add coreutils to dependencies.
2024-08-01 15:55 ` bug#72338: " Z572
@ 2024-08-01 16:54 ` Fabio Natali via Guix-patches via
0 siblings, 0 replies; 5+ messages in thread
From: Fabio Natali via Guix-patches via @ 2024-08-01 16:54 UTC (permalink / raw)
To: zhengjunjie, 72338; +Cc: 72338-done
On 2024-08-01, 23:55 +0800, Z572 <zhengjunjie@iscas.ac.cn> wrote:
> Thanks, push, close.
This is brilliant! Thanks Zheng, much appreciated. Cheers, Fabio.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-01 16:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-28 15:20 [bug#72338] [PATCH] gnu: readymedia: Add coreutils to dependencies Fabio Natali via Guix-patches via
2024-07-30 5:17 ` Zheng Junjie
2024-07-30 10:58 ` Fabio Natali via Guix-patches via
2024-08-01 15:55 ` bug#72338: " Z572
2024-08-01 16:54 ` [bug#72338] " Fabio Natali via Guix-patches via
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).