guix-commits
[Top][All Lists]
Advanced

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

01/31: gnu: bcachefs-tools: Fix shell script wrappers.


From: guix-commits
Subject: 01/31: gnu: bcachefs-tools: Fix shell script wrappers.
Date: Sat, 29 Jul 2023 20:04:57 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit edf50dec80a75414ec44cf8ec52ee05620fd4a7b
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 23 02:00:00 2023 +0200

    gnu: bcachefs-tools: Fix shell script wrappers.
    
    * gnu/packages/file-systems.scm (bcachefs-tools)[arguments]:
    Add a new 'patch-shell-wrappers phase.
---
 gnu/packages/file-systems.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index bc286d3bea..fe4f483ddc 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -618,7 +618,17 @@ from a mounted file system.")
                                                "not test_fsck and "
                                                "not test_list and "
                                                "not test_list_inodes and "
-                                               "not test_list_dirent"))))))))
+                                               "not test_list_dirent")))))
+                 (add-after 'install 'patch-shell-wrappers
+                   ;; These are overcomplicated wrappers that invoke 
readlink(1)
+                   ;; to exec the appropriate bcachefs(8) subcommand.  We can
+                   ;; simply patch in the latter file name directly, and do.
+                   (lambda _
+                     (let ((sbin/ (string-append #$output "/sbin/")))
+                       (substitute* (find-files sbin/ (lambda (file stat)
+                                                        (not (elf-file? 
file))))
+                         (("SDIR=.*") "")
+                         (("\\$\\{SDIR.*}/") sbin/))))))))
       (native-inputs
        (cons* pkg-config
               ;; For generating documentation with rst2man.



reply via email to

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