diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-06 18:53:50 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-09 17:13:58 -0400 |
commit | 0534ceac816cb708434b126e38e98b925516498a (patch) | |
tree | b77be2124af63bc0905e5b9f5735c117058e3d4a /pkgs/development/tools | |
parent | 35b2c0edf2d3e12f1ca7dae2a91f5232a1ab1445 (diff) | |
download | nixlib-0534ceac816cb708434b126e38e98b925516498a.tar nixlib-0534ceac816cb708434b126e38e98b925516498a.tar.gz nixlib-0534ceac816cb708434b126e38e98b925516498a.tar.bz2 nixlib-0534ceac816cb708434b126e38e98b925516498a.tar.lz nixlib-0534ceac816cb708434b126e38e98b925516498a.tar.xz nixlib-0534ceac816cb708434b126e38e98b925516498a.tar.zst nixlib-0534ceac816cb708434b126e38e98b925516498a.zip |
xcbuild: move setup hook to xcbuildHook
Not every package that needs xcbuild will want to use its build phase. I have moved the xcbuild setup hook to the new attribute xcbuildHook. This means that dontUseXcbuild is no longer needed. If you just need to call xcbuild on its own you can just refer to xcbuild.
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/xcbuild/setup-hook.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 70100c196973..9dc03a61f62e 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -19,11 +19,9 @@ xcbuildInstallPhase () { runHook postInstall } -if [ -z "$dontUseXcbuild" ]; then - buildPhase=xcbuildBuildPhase - if [ -z "$installPhase" ]; then - installPhase=xcbuildInstallPhase - fi +buildPhase=xcbuildBuildPhase +if [ -z "$installPhase" ]; then + installPhase=xcbuildInstallPhase fi # if [ -d "*.xcodeproj" ]; then |