about summary refs log tree commit diff
path: root/pkgs/games/build-support
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-02-01 16:37:02 +0100
committeraszlig <aszlig@nix.build>2018-02-01 22:28:20 +0100
commitad0dd95bac65bbb84feb9db118dde303344b7618 (patch)
tree1d43be84a915aff0f488a8a8c8b1cf90dd17fdae /pkgs/games/build-support
parent68b034da1b0a7fb20488b06c646f894458d6beff (diff)
auto-patchelf: Fix adding env hook
The semantics of adding env hooks has changed in
NixOS/nixpkgs@7f3ca3e21a22fd3101b40cadb86899542dec2e35 so that it's now
broken up into several hook variables (envBuildBuildHook,
envBuildHostHook, envBuildTargetHook, envHostHostHook, envHostTargetHook
and envTargetTargetHook).

Fortunately commit NixOS/nixpkgs@a036473a0a0c6100fce316e1444fc33ec6674b
adds a helper function (addEnvHooks) to deal this without referencing
those hook variables directly and rather just providing an offset.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/games/build-support')
-rw-r--r--pkgs/games/build-support/setup-hooks/auto-patchelf.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/games/build-support/setup-hooks/auto-patchelf.sh b/pkgs/games/build-support/setup-hooks/auto-patchelf.sh
index 33408533..501aacbf 100644
--- a/pkgs/games/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/games/build-support/setup-hooks/auto-patchelf.sh
@@ -4,7 +4,7 @@ gatherLibraries() {
     autoPatchelfLibs+=("$1/lib")
 }
 
-envHooks+=(gatherLibraries)
+addEnvHooks "$targetOffset" gatherLibraries
 
 isExecutable() {
     [ "$(file -b -N --mime-type "$1")" = application/x-executable ]