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-08-10 18:22:07 -04:00 · 2017-08-10 18:22:07 -04:00 · 046f091e0d
parent a1cdc2011e
commit 046f091e0d
54 changed files with 64 additions and 80 deletions
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ b/pkgs/applications/science/logic/coq/8.4.nix
@ -60,7 +60,7 @@ stdenv.mkDerivation {
      fi
    }

-    envHooks=(''${envHooks[@]} addCoqPath)
+    addEnvHooks "$targetOffset" addCoqPath
  '';

  passthru = {
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@ -109,7 +109,7 @@ self = stdenv.mkDerivation {
      fi
    }

-    envHooks=(''${envHooks[@]} addCoqPath)
+    addEnvHooks "$targetOffset" addCoqPath
  '';

  preConfigure = ''
--- a/pkgs/applications/science/math/R/setup-hook.sh
+++ b/pkgs/applications/science/math/R/setup-hook.sh
@ -1,5 +1,7 @@
 addRLibPath () {
-    addToSearchPath R_LIBS_SITE $1/library
+    if [[ -d "$1/library" ]]; then
+        addToSearchPath R_LIBS_SITE "$1/library"
+    fi
 }

-envHooks+=(addRLibPath)
+addEnvHooks "$targetOffset" addRLibPath
--- a/pkgs/build-support/emacs/setup-hook.sh
+++ b/pkgs/build-support/emacs/setup-hook.sh
@ -4,4 +4,8 @@ addEmacsVars () {
  fi
 }

-envHooks+=(addEmacsVars)
+# If this is for a wrapper derivation, emacs and the dependencies are all
+# run-time dependencies. If this is for precompiling packages into bytecode,
+# emacs is a compile-time dependency of the package.
+addEnvHooks "$targetOffset" addEmacsVars
+addEnvHooks "$targetOffset" addEmacsVars
--- a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh
+++ b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh
@ -1,4 +1,4 @@
-addCVars () {
+gccWrapperOld_addCVars () {
    if test -d $1/include; then
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include"
    fi
@ -12,7 +12,7 @@ addCVars () {
    fi
 }

-envHooks=(${envHooks[@]} addCVars)
+envBuildBuildHooks+=(gccWrapperOld_addCVars)

 # Note: these come *after* $out in the PATH (see setup.sh).

--- a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
+++ b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
@ -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
--- a/pkgs/build-support/setup-hooks/set-java-classpath.sh
+++ b/pkgs/build-support/setup-hooks/set-java-classpath.sh
@ -10,4 +10,4 @@ addPkgToClassPath () {
    done
 }

-envHooks+=(addPkgToClassPath)
+addEnvHooks "$targetOffset" addPkgToClassPath
--- a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh
+++ b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh
@ -2,4 +2,4 @@ setupDebugInfoDirs () {
    addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug
 }

-envHooks+=(setupDebugInfoDirs)
+addEnvHooks "$targetOffset" setupDebugInfoDirs
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@ -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() {
--- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
+++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
@ -8,7 +8,8 @@ hicolorIconThemeHook() {
 	
 }

-envHooks+=(hicolorIconThemeHook)
+# I think this is meant to be a runtime dep
+addEnvHooks "$hostOffset" hicolorIconThemeHook

 # Remove icon cache
 hicolorPreFixupPhase() {
--- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
+++ b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
@ -4,4 +4,4 @@ make_grilo_find_plugins() {
    fi
 }

-envHooks+=(make_grilo_find_plugins)
+addEnvHooks "$hostOffset" make_grilo_find_plugins
--- a/pkgs/desktops/gnustep/make/setup-hook.sh
+++ b/pkgs/desktops/gnustep/make/setup-hook.sh
@ -74,4 +74,4 @@ addEnvVars() {
 	addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
    fi
 }
-envHooks=(${envHooks[@]} addEnvVars)
+addEnvHooks "$targetOffset" addEnvVars
--- 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
--- 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
--- 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
--- 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/'
    }
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@ -18,7 +18,8 @@
      fi
    }

-    envHooks+=(addIdrisLibs)
+    # All run-time deps
+    addEnvHooks 0 addIdrisLibs
  '';

  buildPhase = ''
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@ -14,7 +14,7 @@
      fi
    }

-    envHooks+=(installIdrisLib)
+    envHostTargetHooks+=(installIdrisLib)
  '';

  unpackPhase = ''
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
  '';

--- 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
--- 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.
--- 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)
--- a/pkgs/development/libraries/SDL/setup-hook.sh
+++ b/pkgs/development/libraries/SDL/setup-hook.sh
@ -4,8 +4,4 @@ addSDLPath () {
  fi
 }

-if test -n "$crossConfig"; then
-  crossEnvHooks+=(addSDLPath)
-else
-  envHooks+=(addSDLPath)
-fi
+addEnvHooks "$hostOffset" addSDLPath
--- a/pkgs/development/libraries/SDL2/setup-hook.sh
+++ b/pkgs/development/libraries/SDL2/setup-hook.sh
@ -4,8 +4,4 @@ addSDL2Path () {
  fi
 }

-if test -n "$crossConfig"; then
-  crossEnvHooks+=(addSDL2Path)
-else
-  envHooks+=(addSDL2Path)
-fi
+addEnvHooks "$hostOffset" addSDL2Path
--- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
+++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
@ -14,4 +14,4 @@ findGdkPixbufLoaders() {

 }

-envHooks+=(findGdkPixbufLoaders)
+addEnvHooks "$hostOffset" findGdkPixbufLoaders
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@ -5,7 +5,7 @@ make_glib_find_gsettings_schemas() {
        addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"*
    fi
 }
-envHooks+=(make_glib_find_gsettings_schemas)
+addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas

 # Install gschemas, if any, in a package-specific directory
 glibPreInstallPhase() {
--- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh
+++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
@ -11,7 +11,7 @@ make_gobject_introspection_find_gir_files() {
    fi
 }

-envHooks+=(make_gobject_introspection_find_gir_files)
+addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files

 _multioutMoveGlibGir() {
  moveToOutput share/gir-1.0 "${!outputDev}"
--- a/pkgs/development/libraries/grantlee/5/setup-hook.sh
+++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh
@ -10,8 +10,4 @@ _grantleeEnvHook() {
        propagatedUserEnvPkgs+=" $1"
    fi
 }
-if [ "$crossEnv" ]; then
-    crossEnvHooks+=(_grantleeEnvHook)
-else
-    envHooks+=(_grantleeEnvHook)
-fi
+addEnvHooks "$hostOffset" _grantleeEnvHook
--- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh
@ -5,5 +5,5 @@ addGstreamer1LibPath () {
    fi
 }

-envHooks+=(addGstreamer1LibPath)
+addEnvHooks "$hostOffset" addGstreamer1LibPath

--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
@ -5,4 +5,4 @@ addGstreamerLibPath () {
    fi
 }

-envHooks+=(addGstreamerLibPath)
+addEnvHooks "$hostOffset" addGstreamerLibPath
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@ -2,7 +2,7 @@ _ecmEnvHook() {
    addToSearchPath XDG_DATA_DIRS "$1/share"
    addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
 }
-envHooks+=(_ecmEnvHook)
+addEnvHooks "$targetOffset" _ecmEnvHook

 _ecmPreConfigureHook() {
    # Because we need to use absolute paths here, we must set *all* the paths.
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh
@ -2,4 +2,4 @@ addXdgData() {
    addToSearchPath XDG_DATA_DIRS "$1/share"
 }

-envHooks+=(addXdgData)
+addEnvHooks "$targetOffset" addXdgData
--- a/pkgs/development/libraries/librep/setup-hook.sh
+++ b/pkgs/development/libraries/librep/setup-hook.sh
@ -2,4 +2,4 @@ addRepDLLoadPath () {
    addToSearchPath REP_DL_LOAD_PATH $1/lib/rep
 }

-envHooks+=(addRepDLLoadPath)
+addEnvHooks "$hostOffset" addRepDLLoadPath
--- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
@ -42,11 +42,7 @@ qtEnvHook() {
        propagatedUserEnvPkgs+=" $1"
    fi
 }
-if [ "$crossConfig" ]; then
-   crossEnvHooks+=(qtEnvHook)
-else
-   envHooks+=(qtEnvHook)
-fi
+envHostTargetHooks+=(qtEnvHook)

 postPatchMkspecs() {
    local bin="${!outputBin}"
--- a/pkgs/development/libraries/rep-gtk/setup-hook.sh
+++ b/pkgs/development/libraries/rep-gtk/setup-hook.sh
@ -2,4 +2,4 @@ addRepDLLoadPath () {
    addToSearchPath REP_DL_LOAD_PATH $1/lib/rep
 }

-envHooks+=(addRepDLLoadPath)
+addEnvHooks "$hostOffset" addRepDLLoadPath
--- a/pkgs/development/libraries/slib/setup-hook.sh
+++ b/pkgs/development/libraries/slib/setup-hook.sh
@ -10,4 +10,4 @@ addSlibPath () {
    fi
 }

-envHooks+=(addSlibPath)
+addEnvHooks "$hostOffset" addSlibPath
--- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
+++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh
@ -31,7 +31,7 @@ collectNixLispLDLP () {

 export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF

-envHooks+=(addASDFPaths setLisp collectNixLispLDLP)
+addEnvHooks "$targetOffset" addASDFPaths setLisp collectNixLispLDLP

 mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home"
 mkdir -p "$HOME"/.cache/common-lisp
--- 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
--- 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
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@ -72,11 +72,7 @@ if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then
    configurePhase=cmakeConfigurePhase
 fi

-if [ -n "$crossConfig" ]; then
-    crossEnvHooks+=(addCMakeParams)
-else
-    envHooks+=(addCMakeParams)
-fi
+addEnvHooks "$targetOffset" addCMakeParams

 makeCmakeFindLibs(){
  isystem_seen=
--- a/pkgs/development/tools/misc/automake/setup-hook.sh
+++ b/pkgs/development/tools/misc/automake/setup-hook.sh
@ -2,4 +2,4 @@ addAclocals () {
    addToSearchPathWithCustomDelimiter : ACLOCAL_PATH $1/share/aclocal
 }

-envHooks+=(addAclocals)
+addEnvHooks "$hostOffset" addAclocals
--- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh
+++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh
@ -3,8 +3,4 @@ addPkgConfigPath () {
    addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig
 }

-if test -n "$crossConfig"; then
-    crossEnvHooks+=(addPkgConfigPath)
-else
-    envHooks+=(addPkgConfigPath)
-fi
+addEnvHooks "$targetOffset" addPkgConfigPath
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
        fi
    }

-    envHooks+=(addOCamlPath)
+    addEnvHooks "$targetOffset" addOCamlPath
  '';

  meta = {
--- a/pkgs/development/web/nodejs/setup-hook.sh
+++ b/pkgs/development/web/nodejs/setup-hook.sh
@ -2,4 +2,4 @@ addNodePath () {
    addToSearchPath NODE_PATH $1/lib/node_modules
 }

-envHooks+=(addNodePath)
+addEnvHooks "$hostOffset" addNodePath
--- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
+++ b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
@ -39,4 +39,4 @@ useSystemCoreFoundationFramework () {
  export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
 }

-envHooks+=(useSystemCoreFoundationFramework)
+addEnvHooks "$hostOffset" useSystemCoreFoundationFramework
--- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
+++ b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh
@ -7,4 +7,4 @@ noDeprecatedDeclarations() {
  fi
 }

-envHooks+=(noDeprecatedDeclarations)
+addEnvHooks "$hostOffset" noDeprecatedDeclarations
--- a/pkgs/tools/text/sgml/opensp/setup-hook.sh
+++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh
@ -18,5 +18,5 @@ if test -z "$sgmlHookDone"; then
    export ftp_proxy=http://nodtd.invalid/

    export SGML_CATALOG_FILES
-    envHooks+=(addSGMLCatalogs)
+    addEnvHooks "$targetOffset" addSGMLCatalogs
 fi
--- a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh
+++ b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh
@ -4,4 +4,4 @@ addTeXMFPath () {
    fi
 }

-envHooks+=(addTeXMFPath)
+addEnvHooks "$targetOffset" addTeXMFPath
--- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh
+++ b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh
@ -4,4 +4,4 @@ addTeXMFPath () {
    fi
 }

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