MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zig: reword setup hook

Browse source 
- Move the huge comment from setup-hook.sh to hook.nix
- Prefix zig in the echoCmd calls
This commit is contained in:
Anderson Torres 2023-09-07 20:11:12 -03:00
parent a71936c70f
commit a49eb940a2
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/compilers/zig/hook.nix
View file

@ -9,6 +9,26 @@ makeSetupHook {
propagatedBuildInputs = [ zig ];
substitutions = {
# This zig_default_flags below is meant to avoid CPU feature impurity in
# Nixpkgs. However, this flagset is "unstable": it is specifically meant to
# be controlled by the upstream development team - being up to that team
# exposing or not that flags to the outside (especially the package manager
# teams).
# Because of this hurdle, @andrewrk from Zig Software Foundation proposed
# some solutions for this issue. Hopefully they will be implemented in
# future releases of Zig. When this happens, this flagset should be
# revisited accordingly.
# Below are some useful links describing the discovery process of this 'bug'
# in Nixpkgs:
# https://github.com/NixOS/nixpkgs/issues/169461
# https://github.com/NixOS/nixpkgs/issues/185644
# https://github.com/NixOS/nixpkgs/pull/197046
# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653
zig_default_flags =
let
releaseType =

26
pkgs/development/compilers/zig/setup-hook.sh
View file

@ -1,25 +1,5 @@
# shellcheck shell=bash disable=SC2154,SC2086
# This readonly zigDefaultBuildFlagsArray below is meant to avoid CPU feature
# impurity in Nixpkgs. However, this flagset is "unstable": it is specifically
# meant to be controlled by the upstream development team - being up to that
# team exposing or not that flags to the outside (especially the package manager
# teams).
# Because of this hurdle, @andrewrk from Zig Software Foundation proposed some
# solutions for this issue. Hopefully they will be implemented in future
# releases of Zig. When this happens, this flagset should be revisited
# accordingly.
# Below are some useful links describing the discovery process of this 'bug' in
# Nixpkgs:
# https://github.com/NixOS/nixpkgs/issues/169461
# https://github.com/NixOS/nixpkgs/issues/185644
# https://github.com/NixOS/nixpkgs/pull/197046
# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653
readonly zigDefaultFlagsArray=(@zig_default_flags@)
function zigSetGlobalCacheDir {
@ -35,7 +15,7 @@ function zigBuildPhase {
$zigBuildFlags "${zigBuildFlagsArray[@]}"
)
echoCmd 'build flags' "${flagsArray[@]}"
echoCmd 'zig build flags' "${flagsArray[@]}"
zig build "${flagsArray[@]}"
runHook postBuild
@ -49,7 +29,7 @@ function zigCheckPhase {
$zigCheckFlags "${zigCheckFlagsArray[@]}"
)
echoCmd 'check flags' "${flagsArray[@]}"
echoCmd 'zig check flags' "${flagsArray[@]}"
zig build test "${flagsArray[@]}"
runHook postCheck
@ -69,7 +49,7 @@ function zigInstallPhase {
flagsArray+=("${prefixKey:---prefix}" "$prefix")
fi
echoCmd 'install flags' "${flagsArray[@]}"
echoCmd 'zig install flags' "${flagsArray[@]}"
zig build install "${flagsArray[@]}"
runHook postInstall