[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
- 13/35: gnu: Add qtdeclarative, version 6.3.1., (continued)
- 13/35: gnu: Add qtdeclarative, version 6.3.1., guix-commits, 2022/08/01
- 12/35: gnu: qtdeclarative: Rename to qtdeclarative-5., guix-commits, 2022/08/01
- 23/35: gnu: Add qt5compat., guix-commits, 2022/08/01
- 33/35: gnu: Deprecate jami-gnome for jami., guix-commits, 2022/08/01
- 35/35: gnu: jami: Apply upstream patch that fixes a usability issue., guix-commits, 2022/08/01
- 28/35: gnu: Add qtpositioning., guix-commits, 2022/08/01
- 17/35: gnu: qtwebsockets: Rename to qtwebsockets-5., guix-commits, 2022/08/01
- 19/35: gnu: qtwebchannel: Rename to qtwebchannel-5., guix-commits, 2022/08/01
- 21/35: gnu: qtwebengine: Rename to qtwebengine-5., guix-commits, 2022/08/01
- 29/35: build: qt: Add qtbase argument and wrap Qt environment variables exactly., guix-commits, 2022/08/01
- 01/35: gnu: qtbase: Patch /bin/pwd in executable scripts.,
guix-commits <=
- 08/35: gnu: qpwgraph: Migrate to Qt 6 and add libxkbcommon input., guix-commits, 2022/08/01
- 22/35: gnu: Add qtwebengine, version 6.3.1., guix-commits, 2022/08/01
- 34/35: gnu: jami: Update to 20220726.1515.da8d1da., guix-commits, 2022/08/01
- 06/35: gnu: qtsvg-5: Fix indentation., guix-commits, 2022/08/01
- 07/35: gnu: Add qtsvg, version 6.3.1., guix-commits, 2022/08/01
- 10/35: gnu: qtmultimedia: Rename to qtmultimedia-5., guix-commits, 2022/08/01
- 20/35: gnu: Add qtwebchannel, version 6.3.1., guix-commits, 2022/08/01
- 30/35: gnu: libjami: Update to 20220726.1515.da8d1da., guix-commits, 2022/08/01