qt5: use distinct lib/qt-5.x prefix for each minor version

Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
parent 08d25152b8
commit 3f3d33a078
30 changed files with 129 additions and 123 deletions
@@ -56,10 +56,10 @@ stdenv.mkDerivation rec {

    # we need to link to our Qt deps in our own output if we want
    # this package to work without being installed as a system pkg
-    mkdir -p $out/lib/qt5 $out/etc/xdg
+    mkdir -p $out/lib/qt-$qtCompatVersion $out/etc/xdg
    for pkg in $qtInputs; do
-      if [[ -d $pkg/lib/qt5 ]]; then
-        for dir in lib/qt5 share etc/xdg; do
+      if [[ -d $pkg/lib/qt-$qtCompatVersion ]]; then
+        for dir in lib/qt-$qtCompatVersion share etc/xdg; do
          if [[ -d $pkg/$dir ]]; then
            ${lndir}/bin/lndir "$pkg/$dir" "$out/$dir"
          fi