mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-25 20:19:18 -05:00
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.
This commit is contained in:
parent
af0b3fdbf9
commit
47d73ac41d
1 changed files with 8 additions and 3 deletions
|
@ -20,9 +20,10 @@
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu services messaging)
|
(define-module (gnu services messaging)
|
||||||
#:use-module (gnu packages messaging)
|
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages irc)
|
#:use-module (gnu packages irc)
|
||||||
|
#:use-module (gnu packages messaging)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu services)
|
#:use-module (gnu services)
|
||||||
#:use-module (gnu services shepherd)
|
#:use-module (gnu services shepherd)
|
||||||
|
@ -829,11 +830,14 @@ (define bitlbee-shepherd-service
|
||||||
(file-append bitlbee "/sbin/bitlbee")
|
(file-append bitlbee "/sbin/bitlbee")
|
||||||
#:name "bitlbee"
|
#:name "bitlbee"
|
||||||
#:preserved-environment-variables
|
#:preserved-environment-variables
|
||||||
'("PURPLE_PLUGIN_PATH")
|
'("PURPLE_PLUGIN_PATH" "GUIX_LOCPATH" "LC_ALL")
|
||||||
#:mappings (list (file-system-mapping
|
#:mappings (list (file-system-mapping
|
||||||
(source "/var/lib/bitlbee")
|
(source "/var/lib/bitlbee")
|
||||||
(target source)
|
(target source)
|
||||||
(writable? #t))
|
(writable? #t))
|
||||||
|
(file-system-mapping
|
||||||
|
(source "/run/current-system/locale")
|
||||||
|
(target source))
|
||||||
(file-system-mapping
|
(file-system-mapping
|
||||||
(source conf)
|
(source conf)
|
||||||
(target conf)))
|
(target conf)))
|
||||||
|
@ -867,7 +871,8 @@ (define bitlbee-shepherd-service
|
||||||
;; Allow 'bitlbee-purple' to use libpurple plugins.
|
;; Allow 'bitlbee-purple' to use libpurple plugins.
|
||||||
#:environment-variables
|
#:environment-variables
|
||||||
(list (string-append "PURPLE_PLUGIN_PATH="
|
(list (string-append "PURPLE_PLUGIN_PATH="
|
||||||
#$plugins "/lib/purple-2")))
|
#$plugins "/lib/purple-2")
|
||||||
|
"GUIX_LOCPATH=/run/current-system/locale"))
|
||||||
|
|
||||||
(make-forkexec-constructor/container
|
(make-forkexec-constructor/container
|
||||||
(list #$(file-append bitlbee "/sbin/bitlbee")
|
(list #$(file-append bitlbee "/sbin/bitlbee")
|
||||||
|
|
Loading…
Reference in a new issue