guix-commits
[Top][All Lists]
Advanced

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

04/05: services: polkit: Choose between polkit-mozjs and polkit-duktape.


From: guix-commits
Subject: 04/05: services: polkit: Choose between polkit-mozjs and polkit-duktape.
Date: Sat, 27 Nov 2021 17:07:20 -0500 (EST)

civodul pushed a commit to branch core-updates-frozen
in repository guix.

commit 72b0c5a3f221afb824772c4969e85d190a8a3205
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Nov 27 22:29:00 2021 +0100

    services: polkit: Choose between polkit-mozjs and polkit-duktape.
    
    * gnu/services/dbus.scm (%default-polkit): New variable.
    (<polkit-configuration>)[polkit]: Default to it.
---
 gnu/services/dbus.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index e7b3dac..a895c63 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès 
<ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès 
<ludo@gnu.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
@@ -301,10 +301,19 @@ tuples, are all set as environment variables when the bus 
daemon launches it."
   polkit-configuration make-polkit-configuration
   polkit-configuration?
   (polkit   polkit-configuration-polkit           ;<package>
-            (default polkit))
+            (default %default-polkit))
   (actions  polkit-configuration-actions          ;list of <package>
             (default '())))
 
+(define %default-polkit
+  ;; The default polkit package.
+  (let-system (system target)
+    ;; Since mozjs depends on Rust, which is currently x86_64-only, use
+    ;; polkit-duktape on other systems.
+    (if (string-prefix? "x86_64-" (or target system))
+        polkit-mozjs
+        polkit-duktape)))
+
 (define %polkit-accounts
   (list (user-group (name "polkitd") (system? #t))
         (user-account



reply via email to

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