diff mbox series

[bug#56771,01/33] gnu: qtbase: Patch /bin/pwd in executable scripts.

Message ID 20220725230803.10002-1-maxim.cournoyer@gmail.com
State Accepted
Headers show
Series *** Update Jami to 20220725, core Qt packages along the way | expand

Commit Message

Maxim Cournoyer July 25, 2022, 11:07 p.m. UTC
* gnu/packages/qt.scm (qtbase)[phases]{patch-paths}: Patch /bin/pwd.
[inputs]: Add coreutils-minimal.
---
 gnu/packages/qt.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ae68317492..fd26264892 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -622,6 +622,9 @@  (define-public qtbase
             (delete 'patch-xdg-open)
             (add-after 'patch-paths 'patch-more-paths
               (lambda* (#:key inputs #:allow-other-keys)
+                (substitute* (find-files "bin" "\\.in$")
+                  (("/bin/pwd")
+                   (search-input-file inputs "bin/pwd")))
                 (substitute* "src/gui/platform/unix/qgenericunixservices.cpp"
                   (("\"xdg-open\"")
                    (format #f "~s" (search-input-file inputs "bin/xdg-open"))))
@@ -687,7 +690,7 @@  (define-public qtbase
                 ninja wayland-protocols)))
     (inputs
      (modify-inputs (package-inputs qtbase-5)
-       (prepend bash-minimal libxcb md4c)
+       (prepend bash-minimal coreutils-minimal libxcb md4c)
        (replace "gtk+" gtk)                ;use latest gtk
        (replace "postgresql" postgresql))) ;use latest postgresql
     (native-search-paths