From 361b1165efc6202bb1bf0b862ef5ef9a61d9d5cd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 18 Oct 2015 14:59:42 -0500 Subject: [PATCH] qtbase: propagate runtime dependencies This is done so that makeQtWrapper works correctly. --- .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index ab34cbd3675..33380ce0d97 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -20,6 +20,25 @@ addQtModule() { 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() { cat "$out/nix-support/qt-inputs" | while read file; do if [[ -h "$out/$file" ]]; then @@ -65,7 +84,7 @@ EOF export QMAKE="$qtOut/bin/qmake" -envHooks+=(addQtModule) +envHooks+=(addQtModule propagateRuntimeDeps) preConfigurePhases+=(setQMakePath) if [[ -n "$NIX_QT_SUBMODULE" ]]; then