guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: rottlog: Do not refer to the canonical coreu


From: guix-commits
Subject: branch master updated: gnu: rottlog: Do not refer to the canonical coreutils.
Date: Fri, 28 Aug 2020 04:30:18 -0400

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new d81b89b  gnu: rottlog: Do not refer to the canonical coreutils.
d81b89b is described below

commit d81b89bf0231c1a994d5f54bc60002f434a3f567
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Aug 28 10:27:53 2020 +0200

    gnu: rottlog: Do not refer to the canonical coreutils.
    
    * gnu/packages/admin.scm (rottlog)[inputs]: Add "coreutils",
    [arguments]: and use it in the 'tweak-rc-weekly phase.
---
 gnu/packages/admin.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5efe67b..6610b8f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1365,10 +1365,11 @@ at once based on a Perl regular expression.")
                          "packdir=\"/var/log\""))
                       #t))
                   (add-before 'install 'tweak-rc-weekly
-                    (lambda _
+                    (lambda* (#:key inputs #:allow-other-keys)
                       (substitute* "rc/weekly"
                         (("/bin/kill")
-                         (which "kill"))
+                         (string-append (assoc-ref inputs "coreutils*")
+                                        "/bin/kill"))
                         (("syslogd\\.pid")
                          ;; The file is called 'syslog.pid' (no 'd').
                          "syslog.pid"))
@@ -1379,6 +1380,7 @@ at once based on a Perl regular expression.")
     (native-inputs `(("texinfo" ,texinfo)
                      ("automake" ,automake)
                      ("util-linux" ,util-linux))) ; for 'cal'
+    (inputs `(("coreutils*" ,coreutils)))
     (home-page "https://www.gnu.org/software/rottlog/";)
     (synopsis "Log rotation and management")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]