diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-06-03 23:49:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-04 00:11:45 +0200 |
| commit | 47d73ac41d4613e3e45a8bb338aaa93aace2dd3b (patch) | |
| tree | b36b0649daee637ec920d3542ac1a5d084a0f3de /gnu/services | |
| parent | af0b3fdbf98004e87dc4270b3a424fd09b70665b (diff) | |
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.
Diffstat (limited to 'gnu/services')
| -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 ec1acba4165..48eff27b494 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm | |||
| @@ -20,9 +20,10 @@ | |||
| 20 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | 20 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. |
| 21 | 21 | ||
| 22 | (define-module (gnu services messaging) | 22 | (define-module (gnu services messaging) |
| 23 | #:use-module (gnu packages messaging) | ||
| 24 | #:use-module (gnu packages admin) | 23 | #:use-module (gnu packages admin) |
| 24 | #:use-module (gnu packages base) | ||
| 25 | #:use-module (gnu packages irc) | 25 | #:use-module (gnu packages irc) |
| 26 | #:use-module (gnu packages messaging) | ||
| 26 | #:use-module (gnu packages tls) | 27 | #:use-module (gnu packages tls) |
| 27 | #:use-module (gnu services) | 28 | #:use-module (gnu services) |
| 28 | #:use-module (gnu services shepherd) | 29 | #:use-module (gnu services shepherd) |
| @@ -829,12 +830,15 @@ string, you could instantiate a prosody service like this: | |||
| 829 | (file-append bitlbee "/sbin/bitlbee") | 830 | (file-append bitlbee "/sbin/bitlbee") |
| 830 | #:name "bitlbee" | 831 | #:name "bitlbee" |
| 831 | #:preserved-environment-variables | 832 | #:preserved-environment-variables |
| 832 | '("PURPLE_PLUGIN_PATH") | 833 | '("PURPLE_PLUGIN_PATH" "GUIX_LOCPATH" "LC_ALL") |
| 833 | #:mappings (list (file-system-mapping | 834 | #:mappings (list (file-system-mapping |
| 834 | (source "/var/lib/bitlbee") | 835 | (source "/var/lib/bitlbee") |
| 835 | (target source) | 836 | (target source) |
| 836 | (writable? #t)) | 837 | (writable? #t)) |
| 837 | (file-system-mapping | 838 | (file-system-mapping |
| 839 | (source "/run/current-system/locale") | ||
| 840 | (target source)) | ||
| 841 | (file-system-mapping | ||
| 838 | (source conf) | 842 | (source conf) |
| 839 | (target conf))) | 843 | (target conf))) |
| 840 | #:namespaces (delq 'net %namespaces)))) | 844 | #:namespaces (delq 'net %namespaces)))) |
| @@ -867,7 +871,8 @@ string, you could instantiate a prosody service like this: | |||
| 867 | ;; Allow 'bitlbee-purple' to use libpurple plugins. | 871 | ;; Allow 'bitlbee-purple' to use libpurple plugins. |
| 868 | #:environment-variables | 872 | #:environment-variables |
| 869 | (list (string-append "PURPLE_PLUGIN_PATH=" | 873 | (list (string-append "PURPLE_PLUGIN_PATH=" |
| 870 | #$plugins "/lib/purple-2"))) | 874 | #$plugins "/lib/purple-2") |
| 875 | "GUIX_LOCPATH=/run/current-system/locale")) | ||
| 871 | 876 | ||
| 872 | (make-forkexec-constructor/container | 877 | (make-forkexec-constructor/container |
| 873 | (list #$(file-append bitlbee "/sbin/bitlbee") | 878 | (list #$(file-append bitlbee "/sbin/bitlbee") |
