aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-07-17 12:13:12 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-07-31 21:55:42 -0400
commit663f12ea2420227e50aff1485cbf0731a46ca021 (patch)
treec6a6d0dc9a5b6f889efb2b2e912f03ca8924c18d
parentab59155c5a38dda7efaceb47c7528578fcf0def4 (diff)
downloadguix-663f12ea2420227e50aff1485cbf0731a46ca021.tar
guix-663f12ea2420227e50aff1485cbf0731a46ca021.tar.gz
gnu: qtbase: Patch /bin/pwd in executable scripts.
* gnu/packages/qt.scm (qtbase)[phases]{patch-paths}: Patch /bin/pwd. [inputs]: Add coreutils-minimal.
-rw-r--r--gnu/packages/qt.scm5
1 files changed, 4 insertions, 1 deletions
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