diff options
| author | Florian Klink <flokli@flokli.de> | 2020-12-25 14:55:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-25 14:55:36 +0100 |
| commit | be0b453d7c7eee2090962c9a83749b024ff9acf5 (patch) | |
| tree | 88cc36f5f3b825ae145dde59c2680bf90dbe65c4 | |
| parent | d4f19a218cbb15a242864a49f8b9f16fb7d48ec8 (diff) | |
| parent | c674a51382ce556f98c76f270275ecece3a4936a (diff) | |
| download | nixpkgs-be0b453d7c7eee2090962c9a83749b024ff9acf5.tar nixpkgs-be0b453d7c7eee2090962c9a83749b024ff9acf5.tar.gz nixpkgs-be0b453d7c7eee2090962c9a83749b024ff9acf5.tar.bz2 nixpkgs-be0b453d7c7eee2090962c9a83749b024ff9acf5.tar.lz nixpkgs-be0b453d7c7eee2090962c9a83749b024ff9acf5.tar.xz nixpkgs-be0b453d7c7eee2090962c9a83749b024ff9acf5.tar.zst nixpkgs-be0b453d7c7eee2090962c9a83749b024ff9acf5.zip | |
Merge pull request #107572 from flokli/nixos-fix-resolved
nixos/systemd: provide libidn2 for systemd-resolved
| -rw-r--r-- | nixos/modules/system/boot/resolved.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 84bc9b78076..7fe8f4dfb7e 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, pkgs, lib, ... }: with lib; let @@ -150,6 +150,9 @@ 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 = { |