diff options
| author | aszlig <aszlig@nix.build> | 2018-02-01 22:09:16 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-02-01 22:28:30 +0100 |
| commit | 8b918f954397fff4718efd8960a46c763c982eff (patch) | |
| tree | 2ccfbc7de3cc1f547db2f29e0a486e92ba1c5fef /pkgs | |
| parent | 349b2a4232e2a3dfe25b7509cb9d77c7d2a10377 (diff) | |
auto-patchelf: Move checkElfDep into buildGame
Having a function in autoPatchelfHook that's unused inside the setup hook is a bit of weird, because the actual usage is within buildGame and thus it should stay there for now. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/auto-patchelf/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/auto-patchelf/setup-hook.sh | 7 | ||||
| -rw-r--r-- | pkgs/games/build-support/build-game.nix | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/build-support/auto-patchelf/default.nix b/pkgs/build-support/auto-patchelf/default.nix index c7a055cb..dfd8e64b 100644 --- a/pkgs/build-support/auto-patchelf/default.nix +++ b/pkgs/build-support/auto-patchelf/default.nix @@ -8,7 +8,6 @@ substituteAll { inherit (stdenv) shell; file = "${file}/bin/file"; find = "${findutils}/bin/find"; - grep = "${gnugrep}/bin/grep"; ldd = "${glibc.bin}/bin/ldd"; objdump = "${binutils-unwrapped}/bin/objdump"; patchelf = "${patchelf}/bin/patchelf"; diff --git a/pkgs/build-support/auto-patchelf/setup-hook.sh b/pkgs/build-support/auto-patchelf/setup-hook.sh index 6e34b4ef..51a6a888 100644 --- a/pkgs/build-support/auto-patchelf/setup-hook.sh +++ b/pkgs/build-support/auto-patchelf/setup-hook.sh @@ -41,13 +41,6 @@ getDepsFromSo() { @ldd@ "$1" 2> /dev/null | @sed@ -n -e 's/[^=]*=> *\(.\+\) \+([^)]*)$/\1/p' } -checkElfDep() { - local errors ldout="$(@ldd@ "$1" 2> /dev/null)" - if errors="$(echo "$ldout" | @grep@ -F "not found")"; then - echo -e "Library dependencies missing for $1:\n$errors" - fi -} - populateCacheWithRecursiveDeps() { local so found foundso for so in "${cachedDependencies[@]}"; do diff --git a/pkgs/games/build-support/build-game.nix b/pkgs/games/build-support/build-game.nix index e4d019af..ea97d72a 100644 --- a/pkgs/games/build-support/build-game.nix +++ b/pkgs/games/build-support/build-game.nix @@ -51,6 +51,13 @@ buildSandbox (stdenv.mkDerivation ({ echo "checking dependencies for libraries and executables" >&2 + checkElfDep() { + local errors ldout="$(ldd "$1" 2> /dev/null)" + if errors="$(echo "$ldout" | grep -F "not found")"; then + echo -e "Library dependencies missing for $1:\n$errors" + fi + } + local errors="$( IFS=$'\n' for elf in $(findElfs "$prefix"); do checkElfDep "$elf"; done |