From 78c3acc2eee5510dfdebcab4e62b32a7f43930c4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 19:57:42 -0600 Subject: [PATCH] xcbuild: Add install phase This phase is disabled for now but we can use it later. --- pkgs/development/tools/xcbuild/setup-hook.sh | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 72ffb7b128c..0d38e2466b0 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -1,15 +1,27 @@ -xcbuildPhase() { - runHook preConfigure +xcbuildBuildPhase() { + export DSTROOT=$out + + runHook preBuild echo "running xcodebuild" - xcodebuild + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build - runHook postConfigure + runHook postBuild } -if [ -z "$dontUseXcbuild" -a -z "$configurePhase" ]; then - configurePhase=xcbuildPhase +xcbuildInstallPhase () { + runHook preInstall + + # not implemented + # xcodebuild install + + runHook postInstall +} + +if [ -z "$dontUseXcbuild" ]; then + buildPhase=xcbuildBuildPhase + installPhase=xcbuildInstallPhase fi # if [ -d "*.xcodeproj" ]; then