diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-10 18:22:07 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-30 22:04:22 -0500 |
| commit | 046f091e0d9853a81ce4d484a75cfa1b5fc9347d (patch) | |
| tree | 4a0094d67c9444330e9b71d4c89d0ce45630e31b /pkgs/os-specific/darwin | |
| parent | a1cdc2011ed049cf8a7a0f2f7909d401dc8d9457 (diff) | |
| download | nixpkgs-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar nixpkgs-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.gz nixpkgs-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.bz2 nixpkgs-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.lz nixpkgs-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.xz nixpkgs-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.zst nixpkgs-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.zip | |
treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of `$hostOffset`, `$targetOffset`, or a fixed offset should be used.
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh index 04d8e878f4f..b0d5915fc1f 100644 --- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh @@ -39,4 +39,4 @@ useSystemCoreFoundationFramework () { export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks } -envHooks+=(useSystemCoreFoundationFramework) +addEnvHooks "$hostOffset" useSystemCoreFoundationFramework diff --git a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh index f31adaa0d74..ed9bdbd912d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh @@ -7,4 +7,4 @@ noDeprecatedDeclarations() { fi } -envHooks+=(noDeprecatedDeclarations) +addEnvHooks "$hostOffset" noDeprecatedDeclarations |