diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-12-30 22:58:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 22:58:02 -0500 |
| commit | 4d2b7638173afb4c0f0c12a43654bcff5c9500ab (patch) | |
| tree | 04068195f42530a34d44a63019ddc9f77654804c /pkgs/development/libraries/qt-5 | |
| parent | 553fd19e679b68082329fdae40dcfb40c2f72cba (diff) | |
| parent | a98e68676dc96e9021d9bb0a9f210ac1a35d368b (diff) | |
| download | nixlib-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/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 8ec7eeda8aee..754a75cbef4f 100644 --- 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}" |