diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-28 12:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-28 12:01:10 +0000 |
| commit | b460ba19982e9531f03e74bc8a0bf6668267daa7 (patch) | |
| tree | 7f3b8e6c8206fee68dc80d566a7328ba929c7073 /pkgs/tools/package-management/nix | |
| parent | cfb80ea275295fb0c43ffbc0493ea6343244ee7b (diff) | |
| parent | 8142fb901dfc9cd97936eba52515e8d4ce74c852 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management/nix')
| -rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 72978db577a6b..d85e40bdc28ac 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -169,6 +169,8 @@ self = stdenv.mkDerivation { "--disable-init-state" ] ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" + ] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [ + "--enable-embedded-sandbox-shell" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system) [ "--with-system=${stdenv.hostPlatform.nix.system}" ] ++ lib.optionals (!withLibseccomp) [ |