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/libraries/kde-frameworks | |
| parent | a1cdc2011ed049cf8a7a0f2f7909d401dc8d9457 (diff) | |
| download | nixlib-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/libraries/kde-frameworks')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index c1b1e21852cf..88091e78a0cd 100644 --- 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. diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh index 5cfffbd622d1..2928d9b34dbe 100644 --- 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 |