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/development/compilers | |
parent | a1cdc2011ed049cf8a7a0f2f7909d401dc8d9457 (diff) | |
download | nixlib-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar nixlib-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.gz nixlib-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.bz2 nixlib-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.lz nixlib-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.xz nixlib-046f091e0d9853a81ce4d484a75cfa1b5fc9347d.tar.zst nixlib-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/development/compilers')
-rw-r--r-- | pkgs/development/compilers/chicken/setup-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/go/setup-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/haxe/setup-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/sbcl/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/chicken/setup-hook.sh b/pkgs/development/compilers/chicken/setup-hook.sh index d7f28539dc64..b0d9b53b5378 100644 --- a/pkgs/development/compilers/chicken/setup-hook.sh +++ b/pkgs/development/compilers/chicken/setup-hook.sh @@ -4,4 +4,4 @@ addChickenRepositoryPath() { export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH" } -envHooks=(${envHooks[@]} addChickenRepositoryPath) +addEnvHooks "$targetOffset" addChickenRepositoryPath diff --git a/pkgs/development/compilers/go/setup-hook.sh b/pkgs/development/compilers/go/setup-hook.sh index 1b91c8312b88..7dce15eeb102 100644 --- a/pkgs/development/compilers/go/setup-hook.sh +++ b/pkgs/development/compilers/go/setup-hook.sh @@ -2,4 +2,4 @@ addToGoPath() { addToSearchPath GOPATH $1/share/go } -envHooks=(${envHooks[@]} addToGoPath) +addEnvHooks "$targetOffset" addToGoPath diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh index 21cc0206859f..e6496107a5ee 100644 --- a/pkgs/development/compilers/haxe/setup-hook.sh +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -4,4 +4,4 @@ addHaxeLibPath() { fi } -envHooks+=(addHaxeLibPath) +addEnvHooks "$targetOffset" addHaxeLibPath diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index b800d71198af..cd3120ed8312 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. setupHook = writeText "setupHook.sh" '' - envHooks+=(_setSbclHome) + addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' } |