colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #212304 from amjoseph-nixpkgs/pr/nix/enable-embedded-sandbox-shell

Browse Source
This commit is contained in:
Artturi 2023-01-28 11:42:12 +02:00 committed by GitHub
commit d6d1b8bfa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/package-management/nix/common.nix
View File

@ -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) [