[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/12: Revert "build-system/qt: Fix wrapping with QTWEBENGINEPROCESS_PAT
From: |
guix-commits |
Subject: |
04/12: Revert "build-system/qt: Fix wrapping with QTWEBENGINEPROCESS_PATH." |
Date: |
Fri, 2 Jul 2021 16:52:50 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 3a94998f5e1699c23fba7843ceba098aa607024d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jul 2 00:58:06 2021 -0400
Revert "build-system/qt: Fix wrapping with QTWEBENGINEPROCESS_PATH."
This reverts commit fed28a9632ba69225151757e44a5d70e9b0652a2. It will need
to
be refactored to fit on top of 2214b7b78d34a0e4d574b743dbeb8457356f6cff.
---
guix/build/qt-build-system.scm | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm
index f59b0c4..bd8e694 100644
--- a/guix/build/qt-build-system.scm
+++ b/guix/build/qt-build-system.scm
@@ -49,23 +49,17 @@
(define (variables-for-wrapping base-directories)
- (define (collect-sub-dirs base-directories file-type subdirectory
+ (define (collect-sub-dirs base-directories subdirectory
selectors)
;; Append SUBDIRECTORY and each of BASE-DIRECTORIES, and return the subset
;; that exists and has at least one of the SELECTORS sub-directories,
- ;; unless SELECTORS is the empty list. FILE-TYPE should by 'directory or
- ;; 'regular file. For the later, it allows searching for plain files
- ;; rather than directories.
- (define exists? (match file-type
- ('directory directory-exists?)
- ('regular file-exists?)))
-
+ ;; unless SELECTORS is the empty list.
(filter-map (lambda (dir)
(let ((directory (string-append dir subdirectory)))
- (and (exists? directory)
+ (and (directory-exists? directory)
(or (null? selectors)
(any (lambda (selector)
- (exists?
+ (directory-exists?
(string-append directory selector)))
selectors))
directory)))
@@ -73,8 +67,8 @@
(filter-map
(match-lambda
- ((variable file-type directory selectors ...)
- (match (collect-sub-dirs base-directories file-type directory
+ ((variable directory selectors ...)
+ (match (collect-sub-dirs base-directories directory
selectors)
(()
#f)
@@ -83,7 +77,7 @@
;; These shall match the search-path-specification for Qt and KDE
;; libraries.
- (list '("XDG_DATA_DIRS" directory "/share"
+ (list '("XDG_DATA_DIRS" "/share"
;; These are "selectors": consider /share if and only if at least
;; one of these sub-directories exist. This avoids adding
@@ -91,11 +85,10 @@
;; /share sub-directory.
"/glib-2.0/schemas" "/sounds" "/themes"
"/cursors" "/wallpapers" "/icons" "/mime")
- '("XDG_CONFIG_DIRS" directory "/etc/xdg")
- '("QT_PLUGIN_PATH" directory "/lib/qt5/plugins")
- '("QML2_IMPORT_PATH" directory "/lib/qt5/qml")
- '("QTWEBENGINEPROCESS_PATH" regular
- "/lib/qt5/libexec/QtWebEngineProcess"))))
+ '("XDG_CONFIG_DIRS" "/etc/xdg")
+ '("QT_PLUGIN_PATH" "/lib/qt5/plugins")
+ '("QML2_IMPORT_PATH" "/lib/qt5/qml")
+ '("QTWEBENGINEPROCESS_PATH" "/lib/qt5/libexec/QtWebEngineProcess"))))
(define* (wrap-all-programs #:key inputs outputs
(qt-wrap-excluded-outputs '())
- branch master updated (b9aab8e -> d5c9cc6), guix-commits, 2021/07/02
- 01/12: gnu: qtbase: Enable GTK support., guix-commits, 2021/07/02
- 05/12: Revert "build-system/qt: Wrappers set 'QTWEBENGINEPROCESS_PATH' if needed.", guix-commits, 2021/07/02
- 02/12: gnu: qtbase: Specify configure flags via the #:configure-flags argument., guix-commits, 2021/07/02
- 03/12: gnu: protobuf: Update to 3.17.3., guix-commits, 2021/07/02
- 04/12: Revert "build-system/qt: Fix wrapping with QTWEBENGINEPROCESS_PATH.",
guix-commits <=
- 07/12: guix: qt-build-system, qt-utils: Unify wrapping of qt-programs., guix-commits, 2021/07/02
- 06/12: Revert "build-system/qt: Wrappers only include relevant directories to XDG_DATA_DIRS.", guix-commits, 2021/07/02
- 11/12: build: qt-utils: Refactor the code to filter XDG_DATA_DIRS., guix-commits, 2021/07/02
- 10/12: guix: qt-utils: Don't include useless inputs in wrapped variables., guix-commits, 2021/07/02
- 08/12: guix: qt-utils: Wrapped executables honor user's envvars., guix-commits, 2021/07/02
- 09/12: build-system: qt: Exclude useless inputs from wrapped variables., guix-commits, 2021/07/02
- 12/12: build: qt-utils: Wrappers set 'QTWEBENGINEPROCESS_PATH' if needed., guix-commits, 2021/07/02