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/interpreters | |
| 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/development/interpreters')
9 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/elixir/setup-hook.sh b/pkgs/development/interpreters/elixir/setup-hook.sh index 2ed3b2e6454..501eca3cf02 100644 --- a/pkgs/development/interpreters/elixir/setup-hook.sh +++ b/pkgs/development/interpreters/elixir/setup-hook.sh @@ -2,4 +2,4 @@ addErlLibPath() { addToSearchPath ERL_LIBS $1/lib/elixir/lib } -envHooks+=(addErlLibPath) +addEnvHooks "$hostOffset" addErlLibPath diff --git a/pkgs/development/interpreters/erlang/setup-hook.sh b/pkgs/development/interpreters/erlang/setup-hook.sh index 68c0f762dfc..3962d154ba9 100644 --- a/pkgs/development/interpreters/erlang/setup-hook.sh +++ b/pkgs/development/interpreters/erlang/setup-hook.sh @@ -2,4 +2,4 @@ addErlangLibPath() { addToSearchPath ERL_LIBS $1/lib/erlang/lib } -envHooks+=(addErlangLibPath) +addEnvHooks "$hostOffset" addErlangLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index fd1dc944ed4..c7fb4f70fc6 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh index 86c1e0d3e4a..73e700bde02 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.2.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/pkgs/development/interpreters/guile/setup-hook.sh index c1d19e579ed..bf04fee1e89 100644 --- a/pkgs/development/interpreters/guile/setup-hook.sh +++ b/pkgs/development/interpreters/guile/setup-hook.sh @@ -5,4 +5,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index ff192c07286..2224a13ba7c 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -36,7 +36,7 @@ jruby = stdenv.mkDerivation rec { addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF ''; diff --git a/pkgs/development/interpreters/perl/setup-hook.sh b/pkgs/development/interpreters/perl/setup-hook.sh index a8656b8531d..7909412806c 100644 --- a/pkgs/development/interpreters/perl/setup-hook.sh +++ b/pkgs/development/interpreters/perl/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } -envHooks+=(addPerlLibPath) +addEnvHooks "$hostOffset" addPerlLibPath diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index dda9bed39f8..3599478537e 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -12,7 +12,7 @@ toPythonPath() { echo $result } -envHooks+=(addPythonPath) +addEnvHooks "$hostOffset" addPythonPath # Determinism: The interpreter is patched to write null timestamps when compiling python files. # This way python doesn't try to update them when we freeze timestamps in nix store. diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d664c00bc31..478c2b45b26 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -142,7 +142,7 @@ let addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF '' + opString useRailsExpress '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) |