public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtbase: remove redundant directory checks 

addToSearchPath already checks if the directory exists before adding it
to the path; it's not necessary to check it again.
This commit is contained in:
Thomas Tuegel 2015-10-07 08:50:53 -05:00
parent b44923561b
commit ebb9c07168
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
View File

@ -19,21 +19,10 @@ addQtModule() {
done done
fi fi
if [[ -d "$1/lib/qt5/plugins" ]]; then addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins"
addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
fi addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
addToSearchPath XDG_DATA_DIRS "$1/share"
if [[ -d "$1/lib/qt5/imports" ]]; then
addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
fi
if [[ -d "$1/lib/qt5/qml" ]]; then
addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
fi
if [[ -d "$1/share" ]]; then
addToSearchPath XDG_DATA_DIRS "$1/share"
fi
} }
rmQtModules() { rmQtModules() {