[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: qutebrowser: Fix build.
|
From: |
guix-commits |
|
Subject: |
01/02: gnu: qutebrowser: Fix build. |
|
Date: |
Mon, 1 Aug 2022 09:34:12 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit aea756ea3312ba7e8229804492ba12001c8de568
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Aug 1 09:12:39 2022 -0400
gnu: qutebrowser: Fix build.
Fixes <https://issues.guix.gnu.org/56864>, which is a regression introduced
with a0beb297a352930b89051ff258a06d78f224d6b9.
* gnu/packages/web-browsers.scm (qutebrowser)
[phases]{wrap-qt-process-path}: Do not use the (no longer valid)
"qtwebengine-5" label; instead, locate QtWebEngineProcess via
'search-input-file'.
Reported-by: Jack Hill <jackhill@jackhill.us>
---
gnu/packages/web-browsers.scm | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index f47db2e752..03d5311131 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -540,13 +540,10 @@ interface.")
(string-append out "/share/qutebrowser/userscripts")))))))
(add-after 'wrap 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin/qutebrowser"))
- (qt-process-path (string-append
- (assoc-ref inputs "qtwebengine-5")
- "/lib/qt5/libexec/QtWebEngineProcess")))
- (wrap-program bin
- `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
+ (wrap-program (search-input-file outputs "bin/qutebrowser")
+ `("QTWEBENGINEPROCESS_PATH" =
+ (,(search-input-file
+ inputs "/lib/qt5/libexec/QtWebEngineProcess")))))))))
(home-page "https://qutebrowser.org/";)
(synopsis "Minimal, keyboard-focused, vim-like web browser")
(description "qutebrowser is a keyboard-focused browser with a minimal