me
/
guix
Archived
1
0
Fork 0
Code

build: glib-or-gtk-build-system: Fix indentation. 

* guix/build/glib-or-gtk-build-system.scm (gtk-module-directories)
(wrap-all-programs): Fix indentation.
master
Maxim Cournoyer 2021-10-03 21:13:43 -04:00
parent eb619cda36
commit 889eebc185
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
guix/build/glib-or-gtk-build-system.scm
View File

@ -63,9 +63,9 @@ with all found directories."
"")) ""))
"3.0") "3.0")
((string-match "gtk\\+-2" ((string-match "gtk\\+-2"
(or (assoc-ref inputs "gtk+") (or (assoc-ref inputs "gtk+")
(assoc-ref inputs "source") (assoc-ref inputs "source")
"")) ""))
"2.0") "2.0")
(else (else
"4.0"))) ; We default to version 4.0. "4.0"))) ; We default to version 4.0.
@ -156,32 +156,32 @@ add a dependency of that output on GLib and GTK+."
(define (sh) (force %sh)) (define (sh) (force %sh))
(define handle-output (define handle-output
(match-lambda (match-lambda
((output . directory) ((output . directory)
(unless (member output glib-or-gtk-wrap-excluded-outputs) (unless (member output glib-or-gtk-wrap-excluded-outputs)
(let* ((bindir (string-append directory "/bin")) (let* ((bindir (string-append directory "/bin"))
(libexecdir (string-append directory "/libexec")) (libexecdir (string-append directory "/libexec"))
(bin-list (filter (negate wrapped-program?) (bin-list (filter (negate wrapped-program?)
(append (find-files bindir ".*") (append (find-files bindir ".*")
(find-files libexecdir ".*")))) (find-files libexecdir ".*"))))
(datadirs (data-directories (datadirs (data-directories
(alist-cons output directory inputs))) (alist-cons output directory inputs)))
(gtk-mod-dirs (gtk-module-directories (gtk-mod-dirs (gtk-module-directories
(alist-cons output directory inputs))) (alist-cons output directory inputs)))
(gio-mod-dirs (gio-module-directories (gio-mod-dirs (gio-module-directories
(alist-cons output directory inputs))) (alist-cons output directory inputs)))
(env-vars `(,@(if (not (null? datadirs)) (env-vars `(,@(if (not (null? datadirs))
(list `("XDG_DATA_DIRS" ":" prefix ,datadirs)) (list `("XDG_DATA_DIRS" ":" prefix ,datadirs))
'()) '())
,@(if (not (null? gtk-mod-dirs)) ,@(if (not (null? gtk-mod-dirs))
(list `("GTK_PATH" ":" prefix ,gtk-mod-dirs)) (list `("GTK_PATH" ":" prefix ,gtk-mod-dirs))
'()) '())
,@(if (not (null? gio-mod-dirs)) ,@(if (not (null? gio-mod-dirs))
(list `("GIO_EXTRA_MODULES" ":" (list `("GIO_EXTRA_MODULES" ":"
prefix ,gio-mod-dirs)) prefix ,gio-mod-dirs))
'())))) '()))))
(for-each (lambda (program) (for-each (lambda (program)
(apply wrap-program program #:sh (sh) env-vars)) (apply wrap-program program #:sh (sh) env-vars))
bin-list)))))) bin-list))))))
(for-each handle-output outputs) (for-each handle-output outputs)
#t) #t)