qtbase: propagate runtime dependencies
This is done so that makeQtWrapper works correctly.
This commit is contained in:
parent
9fa17aa293
commit
361b1165ef
@ -20,6 +20,25 @@ addQtModule() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
propagateRuntimeDeps() {
|
||||||
|
local propagated
|
||||||
|
for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
|
||||||
|
if [[ -d "$1/$dir" ]]; then
|
||||||
|
propagated=
|
||||||
|
for pkg in $propagatedBuildInputs; do
|
||||||
|
if [[ "z$pkg" == "z$1" ]]; then
|
||||||
|
propagated=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [[ -z $propagated ]]; then
|
||||||
|
propagatedBuildInputs="$propagatedBuildInputs $1"
|
||||||
|
fi
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
rmQtModules() {
|
rmQtModules() {
|
||||||
cat "$out/nix-support/qt-inputs" | while read file; do
|
cat "$out/nix-support/qt-inputs" | while read file; do
|
||||||
if [[ -h "$out/$file" ]]; then
|
if [[ -h "$out/$file" ]]; then
|
||||||
@ -65,7 +84,7 @@ EOF
|
|||||||
|
|
||||||
export QMAKE="$qtOut/bin/qmake"
|
export QMAKE="$qtOut/bin/qmake"
|
||||||
|
|
||||||
envHooks+=(addQtModule)
|
envHooks+=(addQtModule propagateRuntimeDeps)
|
||||||
preConfigurePhases+=(setQMakePath)
|
preConfigurePhases+=(setQMakePath)
|
||||||
|
|
||||||
if [[ -n "$NIX_QT_SUBMODULE" ]]; then
|
if [[ -n "$NIX_QT_SUBMODULE" ]]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user