guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: vim: Patch another '/bin/sh' shebang.


From: guix-commits
Subject: 01/02: gnu: vim: Patch another '/bin/sh' shebang.
Date: Sun, 30 Oct 2022 04:06:17 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 2facc0eb37c26ccf89c0ee1bcab29790a9c910d5
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Oct 30 08:45:14 2022 +0200

    gnu: vim: Patch another '/bin/sh' shebang.
    
    * gnu/packages/vim.scm (vim)[arguments]: Adjust custom phase
    'patch-absolute-paths to use absolute value when checking for custom
    cscope command.
---
 gnu/packages/vim.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index ed24c39be2..01f03847c8 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -94,7 +94,7 @@
        #:phases
        (modify-phases %standard-phases
          (add-after 'configure 'patch-absolute-paths
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              (substitute* '("src/testdir/Makefile"
                             "src/testdir/test_filetype.vim"
                             "src/testdir/test_normal.vim"
@@ -106,7 +106,9 @@
                             "src/testdir/test_terminal2.vim")
                (("/bin/sh") (which "sh")))
              (substitute* "src/testdir/test_autocmd.vim"
-               (("/bin/kill") (which "kill")))))
+               (("/bin/kill") (which "kill")))
+             (substitute* "src/if_cscope.c"
+               (("/bin/sh") (search-input-file inputs "/bin/sh")))))
          (add-before 'check 'set-environment-variables
            (lambda* (#:key inputs #:allow-other-keys)
              ;; One of the tests tests timezone-dependent functions.



reply via email to

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