diff options
author | aszlig <aszlig@nix.build> | 2017-11-30 06:42:49 +0100 |
---|---|---|
committer | aszlig <aszlig@nix.build> | 2017-11-30 08:33:59 +0100 |
commit | 38d3fe573f4d0ad2115eaca71a0b8f67fd01a580 (patch) | |
tree | d09bf338919056089be3b59194fa7b647794b15b | |
parent | 28ac40c9d9e1c9afc63c19646f223b28b7ed3bc8 (diff) |
build-sandbox: Move to top-level build-support
This is not only useful for packaging games, so let's make it available from the vuizvui scope, so we can use it from other packages as well. Signed-off-by: aszlig <aszlig@nix.build>
-rw-r--r-- | pkgs/build-support/build-sandbox/default.nix (renamed from pkgs/games/build-support/build-sandbox/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/Makefile (renamed from pkgs/games/build-support/build-sandbox/src/Makefile) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/nix-query.cc (renamed from pkgs/games/build-support/build-sandbox/src/nix-query.cc) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/nix-query.h (renamed from pkgs/games/build-support/build-sandbox/src/nix-query.h) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/params.h (renamed from pkgs/games/build-support/build-sandbox/src/params.h) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/path-cache.cc (renamed from pkgs/games/build-support/build-sandbox/src/path-cache.cc) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/path-cache.h (renamed from pkgs/games/build-support/build-sandbox/src/path-cache.h) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/sandbox.c (renamed from pkgs/games/build-support/build-sandbox/src/sandbox.c) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/setup.c (renamed from pkgs/games/build-support/build-sandbox/src/setup.c) | 0 | ||||
-rw-r--r-- | pkgs/build-support/build-sandbox/src/setup.h (renamed from pkgs/games/build-support/build-sandbox/src/setup.h) | 0 | ||||
-rw-r--r-- | pkgs/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/build-support/default.nix | 3 |
12 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/games/build-support/build-sandbox/default.nix b/pkgs/build-support/build-sandbox/default.nix index fa4bac57..fa4bac57 100644 --- a/pkgs/games/build-support/build-sandbox/default.nix +++ b/pkgs/build-support/build-sandbox/default.nix diff --git a/pkgs/games/build-support/build-sandbox/src/Makefile b/pkgs/build-support/build-sandbox/src/Makefile index cd642b8e..cd642b8e 100644 --- a/pkgs/games/build-support/build-sandbox/src/Makefile +++ b/pkgs/build-support/build-sandbox/src/Makefile diff --git a/pkgs/games/build-support/build-sandbox/src/nix-query.cc b/pkgs/build-support/build-sandbox/src/nix-query.cc index 71208693..71208693 100644 --- a/pkgs/games/build-support/build-sandbox/src/nix-query.cc +++ b/pkgs/build-support/build-sandbox/src/nix-query.cc diff --git a/pkgs/games/build-support/build-sandbox/src/nix-query.h b/pkgs/build-support/build-sandbox/src/nix-query.h index 3eef7c4a..3eef7c4a 100644 --- a/pkgs/games/build-support/build-sandbox/src/nix-query.h +++ b/pkgs/build-support/build-sandbox/src/nix-query.h diff --git a/pkgs/games/build-support/build-sandbox/src/params.h b/pkgs/build-support/build-sandbox/src/params.h index ecfa7295..ecfa7295 100644 --- a/pkgs/games/build-support/build-sandbox/src/params.h +++ b/pkgs/build-support/build-sandbox/src/params.h diff --git a/pkgs/games/build-support/build-sandbox/src/path-cache.cc b/pkgs/build-support/build-sandbox/src/path-cache.cc index 5bfa43a7..5bfa43a7 100644 --- a/pkgs/games/build-support/build-sandbox/src/path-cache.cc +++ b/pkgs/build-support/build-sandbox/src/path-cache.cc diff --git a/pkgs/games/build-support/build-sandbox/src/path-cache.h b/pkgs/build-support/build-sandbox/src/path-cache.h index 368f8d17..368f8d17 100644 --- a/pkgs/games/build-support/build-sandbox/src/path-cache.h +++ b/pkgs/build-support/build-sandbox/src/path-cache.h diff --git a/pkgs/games/build-support/build-sandbox/src/sandbox.c b/pkgs/build-support/build-sandbox/src/sandbox.c index e2aa47cf..e2aa47cf 100644 --- a/pkgs/games/build-support/build-sandbox/src/sandbox.c +++ b/pkgs/build-support/build-sandbox/src/sandbox.c diff --git a/pkgs/games/build-support/build-sandbox/src/setup.c b/pkgs/build-support/build-sandbox/src/setup.c index f351ce19..f351ce19 100644 --- a/pkgs/games/build-support/build-sandbox/src/setup.c +++ b/pkgs/build-support/build-sandbox/src/setup.c diff --git a/pkgs/games/build-support/build-sandbox/src/setup.h b/pkgs/build-support/build-sandbox/src/setup.h index fe882dc5..fe882dc5 100644 --- a/pkgs/games/build-support/build-sandbox/src/setup.h +++ b/pkgs/build-support/build-sandbox/src/setup.h diff --git a/pkgs/default.nix b/pkgs/default.nix index b7255aff..5e6530ab 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,6 +12,7 @@ let self.vuizvui = pkgs.recurseIntoAttrs { mkChannel = callPackage ./build-support/channel.nix { }; + buildSandbox = callPackage build-support/build-sandbox {}; list-gamecontrollers = callPackage ./list-gamecontrollers { }; diff --git a/pkgs/games/build-support/default.nix b/pkgs/games/build-support/default.nix index 3017fe8e..e739c25f 100644 --- a/pkgs/games/build-support/default.nix +++ b/pkgs/games/build-support/default.nix @@ -4,6 +4,7 @@ buildGame = callPackage ./build-game.nix { withPulseAudio = config.pulseaudio or true; }; - buildSandbox = callPackage ./build-sandbox {}; + # XXX: Pass through from parent scope! + buildSandbox = callPackage ../../build-support/build-sandbox {}; buildUnity = callPackage ./build-unity.nix {}; } |