diff options
| author | aszlig <aszlig@nix.build> | 2018-02-01 21:49:49 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-02-01 22:28:28 +0100 |
| commit | 349b2a4232e2a3dfe25b7509cb9d77c7d2a10377 (patch) | |
| tree | b40221ea3f0b44ce0d9842bff5af14f5423c7caa /pkgs/games/build-support/build-game.nix | |
| parent | 4af374e2c191465de99d4169376e1a9430302e82 (diff) | |
auto-patchelf: Move into pkgs/build-support
This is really not game-specific, so let's put it at the top-level and also make sure we substitute all the commands we're using there, even though a few of them are in PATH of stdenv so that it will always work even when the programs available in stdenv should change someday. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/games/build-support/build-game.nix')
| -rw-r--r-- | pkgs/games/build-support/build-game.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/games/build-support/build-game.nix b/pkgs/games/build-support/build-game.nix index b04309a5..e4d019af 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, buildSandbox +{ stdenv, lib, file, unzip, buildSandbox, autoPatchelfHook , withPulseAudio ? true, libpulseaudio ? null , alsaLib @@ -19,9 +19,7 @@ assert withPulseAudio -> libpulseaudio != null; buildSandbox (stdenv.mkDerivation ({ buildInputs = [ stdenv.cc.cc ] ++ buildInputs; - nativeBuildInputs = [ - unzip file ./setup-hooks/auto-patchelf.sh - ] ++ nativeBuildInputs; + nativeBuildInputs = [ unzip autoPatchelfHook ] ++ nativeBuildInputs; preUnpack = preUnpack + '' mkdir "$name" |