diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-09-06 20:46:00 -0400 |
| commit | 65542a8852759f35e19959149ac92297c8b54be5 (patch) | |
| tree | bc8f398c7b10a4725b20aa59ab1452d30f358ea3 /etc | |
| parent | bc60349b5bc58a0b803df5adce1de6db82453744 (diff) | |
| parent | f66aee3d0d2f573187ed5d44ae7c13d73cd4097a (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/guix-install.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 960313d462..bd3ab901ad 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; } && |