me/guix
Archived
1
0
Fork 0
Code Activity

Revert "build-system/qt: Fix wrapping with QTWEBENGINEPROCESS_PATH."

Browse source 
This reverts commit fed28a9632.  It will need to
be refactored to fit on top of 2214b7b78d.
This commit is contained in:
Maxim Cournoyer 2021-07-02 00:58:06 -04:00
parent 0ce685c65f
commit 3a94998f5e
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
guix/build/qt-build-system.scm
View file

@ -49,23 +49,17 @@
(define (variables-for-wrapping base-directories) (define (variables-for-wrapping base-directories)
(define (collect-sub-dirs base-directories file-type subdirectory (define (collect-sub-dirs base-directories subdirectory
selectors) selectors)
;; Append SUBDIRECTORY and each of BASE-DIRECTORIES, and return the subset ;; Append SUBDIRECTORY and each of BASE-DIRECTORIES, and return the subset
;; that exists and has at least one of the SELECTORS sub-directories, ;; that exists and has at least one of the SELECTORS sub-directories,
;; unless SELECTORS is the empty list. FILE-TYPE should by 'directory or ;; unless SELECTORS is the empty list.
;; '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?)))
(filter-map (lambda (dir) (filter-map (lambda (dir)
(let ((directory (string-append dir subdirectory))) (let ((directory (string-append dir subdirectory)))
(and (exists? directory) (and (directory-exists? directory)
(or (null? selectors) (or (null? selectors)
(any (lambda (selector) (any (lambda (selector)
(exists? (directory-exists?
(string-append directory selector))) (string-append directory selector)))
selectors)) selectors))
directory))) directory)))
@ -73,8 +67,8 @@
(filter-map (filter-map
(match-lambda (match-lambda
((variable file-type directory selectors ...) ((variable directory selectors ...)
(match (collect-sub-dirs base-directories file-type directory (match (collect-sub-dirs base-directories directory
selectors) selectors)
(() (()
#f) #f)
@ -83,7 +77,7 @@
;; These shall match the search-path-specification for Qt and KDE ;; These shall match the search-path-specification for Qt and KDE
;; libraries. ;; libraries.
(list '("XDG_DATA_DIRS" directory "/share" (list '("XDG_DATA_DIRS" "/share"
;; These are "selectors": consider /share if and only if at least ;; These are "selectors": consider /share if and only if at least
;; one of these sub-directories exist. This avoids adding ;; one of these sub-directories exist. This avoids adding
@ -91,11 +85,10 @@
;; /share sub-directory. ;; /share sub-directory.
"/glib-2.0/schemas" "/sounds" "/themes" "/glib-2.0/schemas" "/sounds" "/themes"
"/cursors" "/wallpapers" "/icons" "/mime") "/cursors" "/wallpapers" "/icons" "/mime")
'("XDG_CONFIG_DIRS" directory "/etc/xdg") '("XDG_CONFIG_DIRS" "/etc/xdg")
'("QT_PLUGIN_PATH" directory "/lib/qt5/plugins") '("QT_PLUGIN_PATH" "/lib/qt5/plugins")
'("QML2_IMPORT_PATH" directory "/lib/qt5/qml") '("QML2_IMPORT_PATH" "/lib/qt5/qml")
'("QTWEBENGINEPROCESS_PATH" regular '("QTWEBENGINEPROCESS_PATH" "/lib/qt5/libexec/QtWebEngineProcess"))))
"/lib/qt5/libexec/QtWebEngineProcess"))))
(define* (wrap-all-programs #:key inputs outputs (define* (wrap-all-programs #:key inputs outputs
(qt-wrap-excluded-outputs '()) (qt-wrap-excluded-outputs '())