about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-08-10 18:22:07 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-30 22:04:22 -0500
commit046f091e0d9853a81ce4d484a75cfa1b5fc9347d (patch)
tree4a0094d67c9444330e9b71d4c89d0ce45630e31b /pkgs/development/ocaml-modules
parenta1cdc2011ed049cf8a7a0f2f7909d401dc8d9457 (diff)
downloadnixlib-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/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/eliom/setup-hook.sh2
-rw-r--r--pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh
index 096d8f8bf635..9868ab93f791 100644
--- a/pkgs/development/ocaml-modules/eliom/setup-hook.sh
+++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh
@@ -2,4 +2,4 @@ addOcsigenDistilleryTemplate() {
     addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates
 }
 
-envHooks+=(addOcsigenDistilleryTemplate)
+addEnvHooks "$hostOffset" addOcsigenDistilleryTemplate
diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
index a93a7250bebb..6d9504370165 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
+++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
@@ -2,4 +2,4 @@ addOcamlMakefile () {
     export OCAMLMAKEFILE="@out@/include/OCamlMakefile"
 }
 
-envHooks+=(addOcamlMakefile)
+addEnvHooks "$targetOffset" addOcamlMakefile