Merge pull request #8590 from NixOS/fix-qt5-setup-hook

qt54: fix setup-hook.sh, lib/ was not populated in some cases
This commit is contained in:
Thomas Tuegel 2015-07-01 17:00:01 -05:00
commit 726b111c6c

View file

@ -20,11 +20,13 @@ addQtModule() {
fi fi
fi fi
if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then if [[ -d "$1/lib" ]]; then
@lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib" @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
if [[ -n $qtSubmodule ]]; then
find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs" find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
fi fi
fi fi
fi
} }
setQMakePath() { setQMakePath() {