diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-12-05 18:34:17 -0600 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-12-05 18:35:43 -0600 |
commit | 5d8bd748f305b1e53882be68072d2031b0c0b587 (patch) | |
tree | dd56db23dcd2a60ebfc008fe9d40606d39a5dfd0 /pkgs/tools/networking/chrony/default.nix | |
parent | c3e22dd546cccac24d7c9523f32a25fd0e253522 (diff) | |
download | nixpkgs-5d8bd748f305b1e53882be68072d2031b0c0b587.tar nixpkgs-5d8bd748f305b1e53882be68072d2031b0c0b587.tar.gz nixpkgs-5d8bd748f305b1e53882be68072d2031b0c0b587.tar.bz2 nixpkgs-5d8bd748f305b1e53882be68072d2031b0c0b587.tar.lz nixpkgs-5d8bd748f305b1e53882be68072d2031b0c0b587.tar.xz nixpkgs-5d8bd748f305b1e53882be68072d2031b0c0b587.tar.zst nixpkgs-5d8bd748f305b1e53882be68072d2031b0c0b587.zip |
chrony: fix build break from libseccomp 2.4.2
03be1adb bumped libseccomp to 2.4.2, which has this note in the changelog: "Stop defining __NR_x values for syscalls that don't exist, libseccomp now uses __SNR_x internally" This change means that invalid syscalls for Linux that aren't defined in glibc will no longer work. In this unlucky case, 'chrony' was trying to reference the syscall number for 'ppoll', which doesn't exist. Fixing this is easy with a simple patch. This also includes another patch from upstream, which allows clock_adjtime in the seccomp filter list. This is a robustness measure for future glibc versions that use clock_adjutime inside adjtimex(). Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/tools/networking/chrony/default.nix')
-rw-r--r-- | pkgs/tools/networking/chrony/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 69c4f897c93..c0c3281431f 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf"; }; + patches = [ + ./allow-clock_adjtime.patch + ./fix-seccomp-build.patch + ]; + postPatch = '' patchShebangs test ''; |