guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: libnma: Depend on GTK 4.x only on supported platforms.


From: guix-commits
Subject: 02/03: gnu: libnma: Depend on GTK 4.x only on supported platforms.
Date: Fri, 7 Oct 2022 10:03:05 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 06deab3321d387fff3f07efe9c53c7db3ab2aa85
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Oct 7 15:51:29 2022 +0200

    gnu: libnma: Depend on GTK 4.x only on supported platforms.
    
    Partly fixes <https://issues.guix.gnu.org/58352>.
    
    * gnu/packages/gnome.scm (libnma)[arguments]: Set "-Dlibnma_gtk4=false"
    when (supported-package? gtk) returns #f.
    [inputs]: Adjust accordingly.
---
 gnu/packages/gnome.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8043eec30d..12cb4550b3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1763,7 +1763,11 @@ client devices can handle.")
                 "0h095a26w3sgbspsf7wzz8ddg62j3jb9ckrrv41k7cdp0k2dkhsg"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags (list "-Dlibnma_gtk4=true")
+     ;; GTK 4.x depends on Rust (indirectly) so pull it only on platforms
+     ;; where it is supported.
+     `(#:configure-flags ,(if (supported-package? gtk)
+                              `(list "-Dlibnma_gtk4=true")
+                              `(list "-Dlibnma_gtk4=false"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-docbook-xml
@@ -1782,7 +1786,7 @@ client devices can handle.")
            vala))
     (inputs
      (list gcr
-           gtk
+           (if (supported-package? gtk) gtk gtk+)
            iso-codes
            mobile-broadband-provider-info
            network-manager))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]