tup: decompose setup hook into more functions

This makes it possible to call the body of the configure and build
phases without calling or changing the order of other hooks.

+10 -9
pkgs/development/tools/build-managers/tup/default.nix pkgs/by-name/tu/tup/package.nix
pkgs/development/tools/build-managers/tup/fusermount-setuid.patch pkgs/by-name/tu/tup/fusermount-setuid.patch
+10 -7
pkgs/development/tools/build-managers/tup/setup-hook.sh pkgs/by-name/tu/tup/setup-hook.sh
··· 1 #!/bin/sh 2 3 - tupConfigurePhase() { 4 - runHook preConfigure 5 - 6 echo -n CONFIG_TUP_ARCH= >> tup.config 7 case "$system" in 8 "i686-*") echo i386 >> tup.config;; ··· 20 21 tup init 22 tup generate --verbose tupBuild.sh 23 24 runHook postConfigure 25 } 26 ··· 28 configurePhase=tupConfigurePhase 29 fi 30 31 - 32 - tupBuildPhase() { 33 - runHook preBuild 34 - 35 pushd . 36 ./tupBuild.sh 37 popd 38 39 runHook postBuild 40 } 41
··· 1 #!/bin/sh 2 3 + tupConfigure() { 4 echo -n CONFIG_TUP_ARCH= >> tup.config 5 case "$system" in 6 "i686-*") echo i386 >> tup.config;; ··· 18 19 tup init 20 tup generate --verbose tupBuild.sh 21 + } 22 23 + tupConfigurePhase() { 24 + runHook preConfigure 25 + tupConfigure 26 runHook postConfigure 27 } 28 ··· 30 configurePhase=tupConfigurePhase 31 fi 32 33 + tupBuild() { 34 pushd . 35 ./tupBuild.sh 36 popd 37 + } 38 39 + tupBuildPhase() { 40 + runHook preBuild 41 + tupBuild 42 runHook postBuild 43 } 44
-2
pkgs/top-level/all-packages.nix
··· 41195 41196 tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { }; 41197 41198 - tup = callPackage ../development/tools/build-managers/tup { }; 41199 - 41200 turtle-build = callPackage ../development/tools/build-managers/turtle-build { }; 41201 41202 tusk = callPackage ../applications/office/tusk { };
··· 41195 41196 tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { }; 41197 41198 turtle-build = callPackage ../development/tools/build-managers/turtle-build { }; 41199 41200 tusk = callPackage ../applications/office/tusk { };