diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-06-15 08:48:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-06-15 08:48:02 +0200 |
commit | 31530c185e0dea0598871de6fd7c21b07f5bf266 (patch) | |
tree | a7f60dc0b97fe9b2819e0c7f30d32df9fa2092dc /pkgs/build-support/cc-wrapper | |
parent | 63d364483cf477a9e8be430be455c9db8d6d71e2 (diff) | |
parent | b6b678680335a45070bbc997709cd2d6854372c7 (diff) | |
download | nixlib-31530c185e0dea0598871de6fd7c21b07f5bf266.tar nixlib-31530c185e0dea0598871de6fd7c21b07f5bf266.tar.gz nixlib-31530c185e0dea0598871de6fd7c21b07f5bf266.tar.bz2 nixlib-31530c185e0dea0598871de6fd7c21b07f5bf266.tar.lz nixlib-31530c185e0dea0598871de6fd7c21b07f5bf266.tar.xz nixlib-31530c185e0dea0598871de6fd7c21b07f5bf266.tar.zst nixlib-31530c185e0dea0598871de6fd7c21b07f5bf266.zip |
Merge a subset of staging (security)
In particular, this contains Firefox-related and libgcrypt updates. Other larger rebuilds would apparently need lots of time to catch up on Hydra, due to nontrivial rebuilds in other branches than staging.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 9dacacc1f369..28060de74118 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -68,7 +68,7 @@ set -u ccWrapper_addCVars () { # See ../setup-hooks/role.bash local role_post role_pre - getTargetRoleEnvHook + getHostRoleEnvHook if [[ -d "$1/include" ]]; then export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" |