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.
2017-12-30 22:04:22 -05:00
parent a1cdc2011e
commit 046f091e0d
54 changed files with 64 additions and 80 deletions
@@ -18,5 +18,5 @@ if [ -z "$libxmlHookDone" ]; then
    # xmllint and xsltproc from looking in /etc/xml/catalog.
    export XML_CATALOG_FILES
    if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi
-    envHooks+=(addXMLCatalogs)
+    addEnvHooks "$hostOffset" addXMLCatalogs
 fi
@@ -10,4 +10,4 @@ addPkgToClassPath () {
    done
 }

-envHooks+=(addPkgToClassPath)
+addEnvHooks "$targetOffset" addPkgToClassPath
@@ -2,4 +2,4 @@ setupDebugInfoDirs () {
    addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug
 }

-envHooks+=(setupDebugInfoDirs)
+addEnvHooks "$targetOffset" setupDebugInfoDirs
@@ -6,7 +6,7 @@ find_gio_modules() {
    fi
 }

-envHooks+=(find_gio_modules)
+addEnvHooks "$targetOffset" find_gio_modules

 # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
 wrapGAppsHook() {