b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fhs-userenv-bubblewrap: allow additional arguments to bwrap

Browse source
This commit is contained in:
Ben Pye 2021-12-29 12:30:44 -08:00 committed by Jonathan Ringer
parent 2ac78e7a22
commit 29b40b07db
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
View file

@ -8,6 +8,7 @@ args @ {
, extraInstallCommands ? "" , extraInstallCommands ? ""
, meta ? {} , meta ? {}
, passthru ? {} , passthru ? {}
, extraBwrapArgs ? []
, unshareUser ? true , unshareUser ? true
, unshareIpc ? true , unshareIpc ? true
, unsharePid ? true , unsharePid ? true
@ -23,7 +24,7 @@ let
buildFHSEnv = callPackage ./env.nix { }; buildFHSEnv = callPackage ./env.nix { };
env = buildFHSEnv (removeAttrs args [ env = buildFHSEnv (removeAttrs args [
"runScript" "extraInstallCommands" "meta" "passthru" "dieWithParent" "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
]); ]);
@ -169,6 +170,7 @@ let
"''${ro_mounts[@]}" "''${ro_mounts[@]}"
"''${symlinks[@]}" "''${symlinks[@]}"
"''${auto_mounts[@]}" "''${auto_mounts[@]}"
${concatStringsSep "\n " extraBwrapArgs}
${init runScript}/bin/${name}-init ${initArgs} ${init runScript}/bin/${name}-init ${initArgs}
) )
exec "''${cmd[@]}" exec "''${cmd[@]}"