From ad0dd95bac65bbb84feb9db118dde303344b7618 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 1 Feb 2018 16:37:02 +0100 Subject: 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 --- pkgs/games/build-support/setup-hooks/auto-patchelf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/games/build-support') 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 ] -- cgit 1.4.1