02/02: guix-install.sh: Work around locale issues in 'guix-daemon.service'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e1e3fe08480868f960eea3ec1584c0c12b022e25
Author: Ludovic Courtès <address@hidden>
Date:   Thu Sep 5 18:31:03 2019 +0200

    guix-install.sh: Work around locale issues in 'guix-daemon.service'.
    
    * etc/guix-install.sh (sys_enable_guix_daemon): Modify
    'guix-daemon.service' to work around locale issues not fixed in 1.0.1.
---
 etc/guix-install.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 960313d..bd3ab90 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -345,6 +345,17 @@ sys_enable_guix_daemon()
             { cp 
"${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \
                  /etc/systemd/system/;
               chmod 664 /etc/systemd/system/guix-daemon.service;
+
+             # Work around <https://bugs.gnu.org/36074>, present in 1.0.1.
+             sed -i /etc/systemd/system/guix-daemon.service \
+                 -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/";
+
+             # Work around <https://bugs.gnu.org/35671>, present in 1.0.1.
+             if ! grep en_US /etc/systemd/system/guix-daemon.service 
>/dev/null;
+             then sed -i /etc/systemd/system/guix-daemon.service \
+                      -e 's/^Environment=\(.*\)$/Environment=\1 
LC_ALL=en_US.UTF-8';
+             fi;
+
               systemctl daemon-reload &&
                   systemctl start guix-daemon &&
                   systemctl enable guix-daemon; } &&