guix-commits
[Top][All Lists]
Advanced

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

10/11: gnu: varnish: Use absolute file name of "rm".


From: Marius Bakke
Subject: 10/11: gnu: varnish: Use absolute file name of "rm".
Date: Tue, 25 Sep 2018 18:40:23 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 5f33e9063b9b047801d0206e7a74eee8bf6fc52d
Author: Marius Bakke <address@hidden>
Date:   Sun Aug 26 23:31:10 2018 +0200

    gnu: varnish: Use absolute file name of "rm".
    
    * gnu/packages/web.scm (varnish)[arguments]: Rename 'patch-bin-sh-phase to
    'use-absolute-file-names and add substitution.
---
 gnu/packages/web.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b6bee57..26c2e91 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5019,12 +5019,14 @@ deployments.")
                                "--localstatedir=/var")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-/bin/sh
+         (add-after 'unpack 'use-absolute-file-names
            (lambda _
              (substitute* '("bin/varnishtest/vtc_varnish.c"
                             "bin/varnishtest/vtc_process.c"
                             "bin/varnishd/mgt/mgt_vcc.c")
                (("/bin/sh") (which "sh")))
+             (substitute* "bin/varnishd/mgt/mgt_shmem.c"
+               (("rm -rf") (string-append (which "rm") " -rf")))
              #t))
          (add-before 'install 'patch-Makefile
            (lambda _



reply via email to

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