From b8a4e6b26a2451eeab0c0da5a074d07348e763b6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 22 Feb 2018 05:14:16 +0100 Subject: build-game: Remove installCheckPhase This is quite redundant because autoPatchelfHook already scans all shared objects and executables for dependencies and bails out with an error if a dependency isn't found, which is similar to what we're doing in installCheckPhase. Removing this should also speed up builds, especially those with lots of files. Signed-off-by: aszlig --- pkgs/games/build-support/build-game.nix | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/build-support/build-game.nix b/pkgs/games/build-support/build-game.nix index b06537c5..5c1f1ef4 100644 --- a/pkgs/games/build-support/build-game.nix +++ b/pkgs/games/build-support/build-game.nix @@ -10,7 +10,6 @@ assert withPulseAudio -> libpulseaudio != null; , nativeBuildInputs ? [] , preUnpack ? "" , setSourceRoot ? "" -, installCheckPhase ? "" , runtimeDependencies ? [] , sandbox ? {} , ... @@ -43,40 +42,11 @@ buildSandbox (stdenv.mkDerivation ({ ++ runtimeDependencies; in map (dep: dep.lib or dep) deps; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - 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 - )" - - if [ -n "$errors" ]; then - echo "$errors" >&2 - exit 1 - fi - - ${installCheckPhase} - - runHook postInstallCheck - ''; - dontStrip = true; dontPatchELF = true; } // removeAttrs attrs [ "buildInputs" "nativeBuildInputs" "preUnpack" "setSourceRoot" - "installCheckPhase" "runtimeDependencies" "sandbox" + "runtimeDependencies" "sandbox" ])) (sandbox // { paths = let paths = sandbox.paths or {}; -- cgit 1.4.1