summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2017-12-30 22:58:02 -0500
committerGitHub <noreply@github.com>2017-12-30 22:58:02 -0500
commit4d2b7638173afb4c0f0c12a43654bcff5c9500ab (patch)
tree04068195f42530a34d44a63019ddc9f77654804c /pkgs/development/ocaml-modules
parent553fd19e679b68082329fdae40dcfb40c2f72cba (diff)
parenta98e68676dc96e9021d9bb0a9f210ac1a35d368b (diff)
downloadnixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar
nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.gz
nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.bz2
nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.lz
nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.xz
nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.tar.zst
nixlib-4d2b7638173afb4c0f0c12a43654bcff5c9500ab.zip
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
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