diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-10-26 10:36:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-10-26 10:36:50 +0200 |
| commit | d811555465785e76fc06872f4bb14d4dd1dfed8c (patch) | |
| tree | 91db30ffe3553dcd7c9766c4163687f7b951dd16 /pkgs/development/tools/build-managers | |
| parent | 7054a80f3b8061bd532e407f46f60e484a5e9a9c (diff) | |
| parent | 0f8647b0c2bce447f8ce27428de242727104ffb0 (diff) | |
| download | nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.gz nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.bz2 nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.lz nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.xz nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.zst nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.zip | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/tools/build-managers')
3 files changed, 35 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index e007cbac958..4506e3f0f86 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup boot_bin=$out/bin/boot diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 8758afea821..6674fbe7819 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-x2VN/6Kg/n6BW5S4nLKfG67dYrSR/G+Aowf6d2Vbc+0="; + hash = "sha256-dgYYz3tQDG6Z4eE77WO2dXdardxVzzGaFLQ5znPcTlw="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 6305a405af2..dc7780b2fd3 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -28,14 +28,43 @@ mesonConfigurePhase() { echo "meson: enabled parallel building" fi - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "meson: enabled parallel installing" + if [[ ${checkPhase-ninjaCheckPhase} = ninjaCheckPhase && -z $dontUseMesonCheck ]]; then + checkPhase=mesonCheckPhase + fi + if [[ ${installPhase-ninjaInstallPhase} = ninjaInstallPhase && -z $dontUseMesonInstall ]]; then + installPhase=mesonInstallPhase fi runHook postConfigure } +mesonCheckPhase() { + runHook preCheck + + local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}") + + echoCmd 'check flags' "${flagsArray[@]}" + meson test --no-rebuild "${flagsArray[@]}" + + runHook postCheck +} + +mesonInstallPhase() { + runHook preInstall + + # shellcheck disable=SC2086 + local flagsArray=($mesonInstallFlags "${mesonInstallFlagsArray[@]}") + + if [[ -n "$mesonInstallTags" ]]; then + flagsArray+=("--tags" "${mesonInstallTags// /,}") + fi + + echoCmd 'install flags' "${flagsArray[@]}" + meson install --no-rebuild "${flagsArray[@]}" + + runHook postInstall +} + if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then setOutputFlags= configurePhase=mesonConfigurePhase |