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/build-support/emacs/setup-hook.sh | |
| 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/build-support/emacs/setup-hook.sh')
| -rw-r--r-- | pkgs/build-support/emacs/setup-hook.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index defef45b55f..e1db3e828fd 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -4,4 +4,8 @@ addEmacsVars () { fi } -envHooks+=(addEmacsVars) +# If this is for a wrapper derivation, emacs and the dependencies are all +# run-time dependencies. If this is for precompiling packages into bytecode, +# emacs is a compile-time dependency of the package. +addEnvHooks "$targetOffset" addEmacsVars +addEnvHooks "$targetOffset" addEmacsVars |