diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-27 11:32:38 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-27 11:32:38 -0400 |
| commit | cd7047c46169b935719ed5f19f693d97bd760ec7 (patch) | |
| tree | 3f2799fcb9b652044d751758e6086d364805757f /pkgs/tools/package-management/nix/default.nix | |
| parent | 048724c4affebacbc4bd40d1a667ba6a7551fdd0 (diff) | |
| parent | 26e8d58cb545004acb7cbd00db81a402923a2445 (diff) | |
| download | nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.gz nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.bz2 nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.lz nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.xz nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.tar.zst nixlib-cd7047c46169b935719ed5f19f693d97bd760ec7.zip | |
Merge branch 'riscv-limitations'
Diffstat (limited to 'pkgs/tools/package-management/nix/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 |
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"; |