diff options
Diffstat (limited to 'pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh')
| -rw-r--r-- | pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh | 27 |
1 files changed, 2 insertions, 25 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 258b2d09f20..3a558153988 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -4,7 +4,6 @@ qtDocPrefix=@qtDocPrefix@ . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ -. @fix_qt_static_libs@ providesQtRuntime() { [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] @@ -33,29 +32,16 @@ addToQMAKEPATH() { # package depending on the building package. (This is necessary in case # the building package does not provide runtime dependencies itself and so # would not be propagated to the user environment.) -qtCrossEnvHook() { - addToQMAKEPATH "$1" - if providesQtRuntime "$1"; then - if [ "z${!outputBin}" != "z${!outputDev}" ]; then - propagatedBuildInputs+=" $1" - fi - propagatedUserEnvPkgs+=" $1" - fi -} -crossEnvHooks+=(qtCrossEnvHook) - qtEnvHook() { addToQMAKEPATH "$1" if providesQtRuntime "$1"; then if [ "z${!outputBin}" != "z${!outputDev}" ]; then - propagatedNativeBuildInputs+=" $1" + propagatedBuildInputs+=" $1" fi - if [ -z "$crossConfig" ]; then propagatedUserEnvPkgs+=" $1" - fi fi } -envHooks+=(qtEnvHook) +envHostTargetHooks+=(qtEnvHook) postPatchMkspecs() { local bin="${!outputBin}" @@ -76,12 +62,3 @@ postPatchMkspecs() { if [ -z "$dontPatchMkspecs" ]; then postPhases="${postPhases}${postPhases:+ }postPatchMkspecs" fi - -postMoveQtStaticLibs() { - if [ "z${!outputLib}" != "z${!outputDev}" ]; then - fixQtStaticLibs "${!outputLib}" "${!outputDev}" - fi -} -if [ -z "$dontMoveQtStaticLibs" ]; then - postPhases="${postPhases}${postPhases:+ }postMoveQtStaticLibs" -fi |