From ba049bb2da285a25230075c0d8ba94fb590f8823 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 24 Sep 2021 15:26:05 +0000 Subject: 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. --- guix/build/glib-or-gtk-build-system.scm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'guix/build/glib-or-gtk-build-system.scm') diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index 8d3c3684d3..9f4cc09eeb 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -51,12 +51,24 @@ "Check for the existence of \"libdir/gtk-v.0\" in INPUTS. Return a list with all found directories." (let* ((version - (if (string-match "gtk\\+-3" - (or (assoc-ref inputs "gtk+") - (assoc-ref inputs "source") - "gtk+-3")) ; we default to version 3 - "3.0" - "2.0")) + (cond + ((string-match "gtk-4" + (or (assoc-ref inputs "gtk") + (assoc-ref inputs "source") + "")) + "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 (lambda (input prev) (let* ((in (match input -- cgit v1.2.3