build: glib-or-gtk-build-system: Add gtk 4.0 support.
* guix/build/glib-or-gtk-build-system.scm (gtk-module-directories): Add gtk 4.0 support.
This commit is contained in:
parent
1d8bb73d3d
commit
ba049bb2da
@ -51,12 +51,24 @@
|
|||||||
"Check for the existence of \"libdir/gtk-v.0\" in INPUTS. Return a list
|
"Check for the existence of \"libdir/gtk-v.0\" in INPUTS. Return a list
|
||||||
with all found directories."
|
with all found directories."
|
||||||
(let* ((version
|
(let* ((version
|
||||||
(if (string-match "gtk\\+-3"
|
(cond
|
||||||
(or (assoc-ref inputs "gtk+")
|
((string-match "gtk-4"
|
||||||
(assoc-ref inputs "source")
|
(or (assoc-ref inputs "gtk")
|
||||||
"gtk+-3")) ; we default to version 3
|
(assoc-ref inputs "source")
|
||||||
"3.0"
|
""))
|
||||||
"2.0"))
|
"4.0")
|
||||||
|
((string-match "gtk\\+-3"
|
||||||
|
(or (assoc-ref inputs "gtk+")
|
||||||
|
(assoc-ref inputs "source")
|
||||||
|
""))
|
||||||
|
"3.0")
|
||||||
|
((string-match "gtk\\+-2"
|
||||||
|
(or (assoc-ref inputs "gtk+")
|
||||||
|
(assoc-ref inputs "source")
|
||||||
|
""))
|
||||||
|
"2.0")
|
||||||
|
(else
|
||||||
|
"4.0"))) ; We default to version 4.0.
|
||||||
(gtk-module
|
(gtk-module
|
||||||
(lambda (input prev)
|
(lambda (input prev)
|
||||||
(let* ((in (match input
|
(let* ((in (match input
|
||||||
|
Loading…
Reference in New Issue
Block a user