GNU bug report logs - #56771
[PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way

Previous Next

Full log

View this message in rfc822 format

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 56771 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [bug#56771] [PATCH 01/33] gnu: qtbase: Patch /bin/pwd in executable scripts.
Date: Mon, 25 Jul 2022 19:07:31 -0400

* 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 --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
-- 
2.36.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.