Skip to content

Commit

Permalink
ntp: Don't use seccomp on non-x86
Browse files Browse the repository at this point in the history
It only has the allowed system call numbers defined for i386 and x86_64
so it fails to build otherwise.
  • Loading branch information
dezgeg committed Nov 26, 2016
1 parent e24df8e commit 2d679db
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions 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";

Expand All @@ -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" ];

Expand Down

0 comments on commit 2d679db

Please sign in to comment.