summary refs log tree commit diff
path: root/pkgs/tools/package-management/nix/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/tools/package-management/nix/default.nix
parentcdf9a78a3ebb535fa6ba88fce88c655776d2474f (diff)
downloadnixlib-26e8d58cb545004acb7cbd00db81a402923a2445.tar
nixlib-26e8d58cb545004acb7cbd00db81a402923a2445.tar.gz
nixlib-26e8d58cb545004acb7cbd00db81a402923a2445.tar.bz2
nixlib-26e8d58cb545004acb7cbd00db81a402923a2445.tar.lz
nixlib-26e8d58cb545004acb7cbd00db81a402923a2445.tar.xz
nixlib-26e8d58cb545004acb7cbd00db81a402923a2445.tar.zst
nixlib-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/tools/package-management/nix/default.nix')
-rw-r--r--pkgs/tools/package-management/nix/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 5140ddd0283d..677c3896fc12 100644
--- 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 is20 [ brotli ] # Since 1.12
-      ++ lib.optional (hostPlatform.isSeccomputable) libseccomp
+      ++ lib.meta.enableIfAvailable libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {
             apis = ["s3"];
@@ -60,7 +60,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.isSeccomputable) "--disable-seccomp-sandboxing";
+      ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing";
 
     makeFlags = "profiledir=$(out)/etc/profile.d";