Merge pull request #119238 from xfix/revert-no-longer-necessary-systemd-bug-workaround

Revert "nixos/systemd: provide libidn2 for systemd-resolved"
This commit is contained in:
Jörg Thalheim 2021-04-16 07:41:39 +01:00 committed by GitHub
commit ec050f16d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ config, lib, ... }:
with lib;
let
@ -150,9 +150,6 @@ in
wantedBy = [ "multi-user.target" ];
aliases = [ "dbus-org.freedesktop.resolve1.service" ];
restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
# Upstream bug: https://github.com/systemd/systemd/issues/18078
# systemd-resolved without libidn2 is broken
environment.LD_LIBRARY_PATH = "${lib.getLib pkgs.libidn2}/lib";
};
environment.etc = {