diff options
| author | Richard Marko <srk@48.io> | 2018-07-04 13:28:07 +0200 |
|---|---|---|
| committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2018-07-04 11:28:07 +0000 |
| commit | 91575dd285efcd75d7e09a94ef619bf4a6bc4bd2 (patch) | |
| tree | 4207a0bc7a32c9c1f9486be373724859cd7ce6f9 /pkgs/tools | |
| parent | 45f8c2ac29c28060d284318baf0565c13b2b131f (diff) | |
| download | nixlib-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar nixlib-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.gz nixlib-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.bz2 nixlib-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.lz nixlib-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.xz nixlib-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.tar.zst nixlib-91575dd285efcd75d7e09a94ef619bf4a6bc4bd2.zip | |
pps-tools: init at 1.0.2, enable for chrony, gpsd, ntp (#42889)
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/chrony/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/ntp/default.nix | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 27f5ca2c7dd1..2db26985dcf9 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr -, libseccomp }: +, libseccomp, pps-tools }: assert stdenv.isLinux -> libcap != null; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ readline texinfo nss nspr ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; nativeBuildInputs = [ pkgconfig ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 6e566d3c4739..467b17e468a2 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: +{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null, pps-tools }: assert stdenv.isLinux -> libcap != null; assert stdenv.isLinux -> libseccomp != null; @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; - buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp; + buildInputs = [ libcap openssl perl ] + ++ lib.optional withSeccomp libseccomp + ++ lib.optional stdenv.isLinux pps-tools; hardeningEnable = [ "pie" ]; |