diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:53:16 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:53:16 +0200 |
| commit | 091eb323ba2787ce64a1fb2796e7e06dbee6037c (patch) | |
| tree | 446a869245541bd48f303caef76e4c24f6e7d0bb /gnu/services/messaging.scm | |
| parent | 05fef7bfc60058763f5a64ec0feaf3876b56281d (diff) | |
| parent | 0c5299200ffcd16370f047b7ccb187c60f30da34 (diff) | |
| download | guix-patches-091eb323ba2787ce64a1fb2796e7e06dbee6037c.tar guix-patches-091eb323ba2787ce64a1fb2796e7e06dbee6037c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/messaging.scm')
| -rw-r--r-- | gnu/services/messaging.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index ec1acba416..48eff27b49 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -20,9 +20,10 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu services messaging) - #:use-module (gnu packages messaging) #:use-module (gnu packages admin) + #:use-module (gnu packages base) #:use-module (gnu packages irc) + #:use-module (gnu packages messaging) #:use-module (gnu packages tls) #:use-module (gnu services) #:use-module (gnu services shepherd) @@ -829,12 +830,15 @@ string, you could instantiate a prosody service like this: (file-append bitlbee "/sbin/bitlbee") #:name "bitlbee" #:preserved-environment-variables - '("PURPLE_PLUGIN_PATH") + '("PURPLE_PLUGIN_PATH" "GUIX_LOCPATH" "LC_ALL") #:mappings (list (file-system-mapping (source "/var/lib/bitlbee") (target source) (writable? #t)) (file-system-mapping + (source "/run/current-system/locale") + (target source)) + (file-system-mapping (source conf) (target conf))) #:namespaces (delq 'net %namespaces)))) @@ -867,7 +871,8 @@ string, you could instantiate a prosody service like this: ;; Allow 'bitlbee-purple' to use libpurple plugins. #:environment-variables (list (string-append "PURPLE_PLUGIN_PATH=" - #$plugins "/lib/purple-2"))) + #$plugins "/lib/purple-2") + "GUIX_LOCPATH=/run/current-system/locale")) (make-forkexec-constructor/container (list #$(file-append bitlbee "/sbin/bitlbee") |