diff options
| -rw-r--r-- | nixos/modules/services/networking/openntpd.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix index 7d01246ed769..ef5250888989 100644 --- a/nixos/modules/services/networking/openntpd.nix +++ b/nixos/modules/services/networking/openntpd.nix @@ -5,10 +5,7 @@ with lib; let cfg = config.services.openntpd; - package = pkgs.openntpd.override { - privsepUser = "ntp"; - privsepPath = "/var/empty"; - }; + package = pkgs.openntpd_nixos; cfgFile = pkgs.writeText "openntpd.conf" '' ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)} @@ -55,7 +52,7 @@ in services.ntp.enable = mkForce false; # Add ntpctl to the environment for status checking - environment.systemPackages = [ openntpd ]; + environment.systemPackages = [ package ]; users.extraUsers = singleton { name = "ntp"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e31ec11712e6..3e700a80855b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2071,6 +2071,11 @@ let openntpd = callPackage ../tools/networking/openntpd { }; + openntpd_nixos = openntpd.override { + privsepUser = "ntp"; + privsepPath = "/var/empty"; + }; + openobex = callPackage ../tools/bluetooth/openobex { }; openopc = callPackage ../tools/misc/openopc { |