about summary refs log tree commit diff
path: root/pkgs/games/build-support/build-game.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-10-03 21:47:02 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-10-03 23:41:39 +0200
commitb7e0a4c55944b266f2a6c2aa65d093eb31dcc3ad (patch)
tree7d0157f09c5c13ca30ab887c8039ff6909d1bad3 /pkgs/games/build-support/build-game.nix
parent0bf66bd8d1a1db8c512c66069731bf67a9836a44 (diff)
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/games/build-support/build-game.nix')
-rw-r--r--pkgs/games/build-support/build-game.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/games/build-support/build-game.nix b/pkgs/games/build-support/build-game.nix
index f23ddd9a..51d3c7d5 100644
--- a/pkgs/games/build-support/build-game.nix
+++ b/pkgs/games/build-support/build-game.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, file, unzip
+{ stdenv, lib, file, unzip, buildSandbox
 
 , withPulseAudio ? true, libpulseaudio ? null
 , alsaLib
@@ -13,10 +13,11 @@ assert withPulseAudio -> libpulseaudio != null;
 , installCheckPhase ? ""
 , runtimeDependencies ? []
 , extraSandboxPaths ? [ "$XDG_DATA_HOME" "$XDG_CONFIG_HOME" ]
+, extraRuntimePathVars ? []
 , ...
 }@attrs:
 
-stdenv.mkDerivation ({
+buildSandbox (stdenv.mkDerivation ({
   buildInputs = [ stdenv.cc.cc ] ++ buildInputs;
 
   nativeBuildInputs = [
@@ -73,4 +74,8 @@ stdenv.mkDerivation ({
 } // removeAttrs attrs [
   "buildInputs" "nativeBuildInputs" "preUnpack" "setSourceRoot"
   "installCheckPhase" "runtimeDependencies" "extraSandboxPaths"
-])
+  "extraRuntimePathVars"
+])) {
+  inherit extraSandboxPaths;
+  runtimePathVars = lib.singleton "LD_LIBRARY_PATH" ++ extraRuntimePathVars;
+}