summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/default.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-03-25 17:52:20 -0400
committerShea Levy <shea@shealevy.com>2018-03-27 08:16:24 -0400
commit26e8d58cb545004acb7cbd00db81a402923a2445 (patch)
treeaee8756eb01ad3b51a90b6027abc1736ae0eaa3b /pkgs/os-specific/linux/systemd/default.nix
parentcdf9a78a3ebb535fa6ba88fce88c655776d2474f (diff)
downloadnixpkgs-26e8d58cb545004acb7cbd00db81a402923a2445.tar
nixpkgs-26e8d58cb545004acb7cbd00db81a402923a2445.tar.gz
nixpkgs-26e8d58cb545004acb7cbd00db81a402923a2445.tar.bz2
nixpkgs-26e8d58cb545004acb7cbd00db81a402923a2445.tar.lz
nixpkgs-26e8d58cb545004acb7cbd00db81a402923a2445.tar.xz
nixpkgs-26e8d58cb545004acb7cbd00db81a402923a2445.tar.zst
nixpkgs-26e8d58cb545004acb7cbd00db81a402923a2445.zip
libseccomp: Disable only on RISC-V if Linux.
The isSeccomputable flag treated Linux without seccomp as just a
normal variant, when it really should be treated as a special case
incurring complexity debt to support.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 763c28464ab..7b3590e5c19 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -41,8 +41,10 @@ in stdenv.mkDerivation rec {
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
-      libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++
-    [ libseccomp libffi audit lz4 bzip2 libapparmor
+      libmicrohttpd ] ++
+      stdenv.lib.meta.enableIfAvailable kexectools ++
+      stdenv.lib.meta.enableIfAvailable libseccomp ++
+    [ libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv