guix-commits
[Top][All Lists]
Advanced

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

01/35: gnu: qtbase: Patch /bin/pwd in executable scripts.


From: guix-commits
Subject: 01/35: gnu: qtbase: Patch /bin/pwd in executable scripts.
Date: Mon, 1 Aug 2022 00:12:11 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit 663f12ea2420227e50aff1485cbf0731a46ca021
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jul 17 12:13:12 2022 -0400

    gnu: qtbase: Patch /bin/pwd in executable scripts.
    
    * 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 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
             (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 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
                 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



reply via email to

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