From 2d679dbe745e05e62a0f14c0fad12f83f3d4e2b3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 26 Nov 2016 20:38:17 +0200 Subject: [PATCH] ntp: Don't use seccomp on non-x86 It only has the allowed system call numbers defined for i386 and x86_64 so it fails to build otherwise. --- pkgs/tools/networking/ntp/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index a37b1bdbd98..64f4b9008b1 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,8 +1,12 @@ -{ stdenv, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: +{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: assert stdenv.isLinux -> libcap != null; assert stdenv.isLinux -> libseccomp != null; +let + withSeccomp = stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); +in + stdenv.mkDerivation rec { name = "ntp-4.2.8p9"; @@ -17,12 +21,10 @@ stdenv.mkDerivation rec { "--with-openssl-libdir=${openssl.out}/lib" "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" - ] ++ stdenv.lib.optionals stdenv.isLinux [ - "--enable-linuxcaps" - "--enable-libseccomp" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" + ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; - buildInputs = [ libcap openssl libseccomp perl ]; + buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp; hardeningEnable = [ "pie" ];