diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-18 02:48:03 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-18 09:02:10 -0500 |
| commit | 765194d7abb34f82fad697a769c570dd71f87530 (patch) | |
| tree | 5750b8cb5d7785456ce3a5aa707f077818a2d8ed /pkgs | |
| parent | 5a0eec1de1d25a3a63c65010e2351aee60bac958 (diff) | |
| download | nixpkgs-765194d7abb34f82fad697a769c570dd71f87530.tar nixpkgs-765194d7abb34f82fad697a769c570dd71f87530.tar.gz nixpkgs-765194d7abb34f82fad697a769c570dd71f87530.tar.bz2 nixpkgs-765194d7abb34f82fad697a769c570dd71f87530.tar.lz nixpkgs-765194d7abb34f82fad697a769c570dd71f87530.tar.xz nixpkgs-765194d7abb34f82fad697a769c570dd71f87530.tar.zst nixpkgs-765194d7abb34f82fad697a769c570dd71f87530.zip | |
nixUnstable: Disable seccomp support on RISC-V.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index cb1f5192822..f6e6988270a 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 fromGit [ brotli ] # Since 1.12 - ++ lib.optional stdenv.isLinux libseccomp + ++ lib.optional (stdenv.isLinux && !hostPlatform.isRiscV) libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; @@ -55,7 +55,9 @@ let ] ++ lib.optional ( hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system - ) ''--with-system=${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"; makeFlags = "profiledir=$(out)/etc/profile.d"; |