summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-06-03 23:49:02 +0200
committerLudovic Courtès <ludo@gnu.org>2022-06-04 00:11:45 +0200
commit47d73ac41d4613e3e45a8bb338aaa93aace2dd3b (patch)
treeb36b0649daee637ec920d3542ac1a5d084a0f3de
parentaf0b3fdbf98004e87dc4270b3a424fd09b70665b (diff)
downloadguix-patches-47d73ac41d4613e3e45a8bb338aaa93aace2dd3b.tar
guix-patches-47d73ac41d4613e3e45a8bb338aaa93aace2dd3b.tar.gz
services: bitlbee: Run under a UTF-8 locale.
* gnu/services/messaging.scm (bitlbee-shepherd-service): In the 'make-inetd-constructor' case, set GUIX_LOCPATH and LC_ALL. In the 'least-authority-wrapper' call, preserve GUIX_LOCPATH and LC_ALL, and map /run/current-system/locale.
-rw-r--r--gnu/services/messaging.scm11
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")