From b7e0a4c55944b266f2a6c2aa65d093eb31dcc3ad Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 Oct 2017 21:47:02 +0200 Subject: pkgs/build-game: Enable sandbox by default This is using buildSandbox with the addition of adding LD_LIBRARY_PATH to the default runtimePathVars. I've also renamed the attribute to be called runtimePathVars instead of runtimePathVariables, simply because it's shorter. Signed-off-by: aszlig --- pkgs/games/build-support/build-sandbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/games/build-support/build-sandbox') diff --git a/pkgs/games/build-support/build-sandbox/default.nix b/pkgs/games/build-support/build-sandbox/default.nix index e7243d2c..e4826405 100644 --- a/pkgs/games/build-support/build-sandbox/default.nix +++ b/pkgs/games/build-support/build-sandbox/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgconfig, nix }: -drv: { extraSandboxPaths ? [], runtimePathVariables ? [], ... }@attrs: +drv: { extraSandboxPaths ? [], runtimePathVars ? [], ... }@attrs: stdenv.mkDerivation ({ name = "${drv.name}-sandboxed"; @@ -50,7 +50,7 @@ stdenv.mkDerivation ({ escaped = lib.escapeShellArg (lib.escape ["\\" "\""] pathvar); fun = "mount_from_path_var"; result = "echo 'if (!${fun}(qs, \"'${escaped}'\")) return false;'"; - in "${result} >> params.c") runtimePathVariables} + in "${result} >> params.c") runtimePathVars} echo 'return true; }' >> params.c ''; @@ -59,4 +59,4 @@ stdenv.mkDerivation ({ buildInputs = [ nix ]; makeFlags = [ "BINDIR=${drv}/bin" ]; -} // removeAttrs attrs [ "extraSandboxPaths" "runtimePathVariables" ]) +} // removeAttrs attrs [ "extraSandboxPaths" "runtimePathVars" ]) -- cgit 1.4.1