Only build libseccomp on supported systems

NixOS · Feb 25, 2018 · 3c57e77 · shlevy · Mar 24, 2018 · Ericson2314
1 parent 1c1a6df
commit 3c57e77
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
@@ -40,6 +40,8 @@ rec {
                      [ "x86" "arm" "aarch64" "mips" ];
     Efi          = map (family: { cpu.family = family; })
                      [ "x86" "arm" "aarch64" ];
+    Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
+                      [ "x86" "arm" "aarch64" "mips" ];
   };
 
   matchAnyAttrs = patterns:

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
@@ -30,7 +30,7 @@ let
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals fromGit [ brotli ] # Since 1.12
-      ++ lib.optional (stdenv.isLinux && !hostPlatform.isRiscV) libseccomp
+      ++ lib.optional (hostPlatform.isSeccomputable) libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {
             apis = ["s3"];
@@ -57,7 +57,7 @@ let
           hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system
       ) ''--with-system=${hostPlatform.nix.system}''
          # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
-      ++ lib.optional hostPlatform.isRiscV "--disable-seccomp-sandboxing";
+      ++ lib.optional (!hostPlatform.isSeccomputable) "--disable-seccomp-sandboxing";
 
     makeFlags = "profiledir=$(out)/etc/profile.d";
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -9644,7 +9644,9 @@ with pkgs;
 
   libgroove = callPackage ../development/libraries/libgroove { };
 
-  libseccomp = callPackage ../development/libraries/libseccomp { };
+  libseccomp =  if hostPlatform.isSeccomputable
+                  then callPackage ../development/libraries/libseccomp { }
+                else null;
 
   libsecret = callPackage ../development/libraries/libsecret { };