pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch

   1 From 30d3906ff5e8671e9c97c5336c6c549656c0e293 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
   3 Date: Sat, 4 Apr 2020 00:27:41 +0200
   4 Subject: [PATCH 04/11] qtbase-replace-libdir
   5
   6 ---
   7  mkspecs/features/qt_common.prf | 20 ++------------------
   8  mkspecs/features/qt_module.prf |  5 +----
   9  2 files changed, 3 insertions(+), 22 deletions(-)
  10
  11 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
  12 index 8df94aa4ee..414029f31c 100644
  13 --- a/mkspecs/features/qt_common.prf
  14 +++ b/mkspecs/features/qt_common.prf
  15 @@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) {
  16          rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
  17      else: \
  18          rplbase = $$MODULE_BASE_OUTDIR
  19 -    host_build {
  20 -        qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
  21 -        qt_libdir = $$[QT_HOST_LIBS]
  22 -    } else {
  23 -        qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]
  24 -        qt_libdir = $$[QT_INSTALL_LIBS]
  25 -    }
  26 +    qt_libdir = $$NIX_OUTPUT_OUT/lib
  27      contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
  28 -        lib_replace0.match = $$rplbase/lib/
  29 -        lib_replace0.replace = $$qqt_libdir/
  30 -        lib_replace0.CONFIG = path
  31 -        QMAKE_PRL_INSTALL_REPLACE += lib_replace0
  32          lib_replace.match = "[^ ']*$$rplbase/lib"
  33          lib_replace.replace =
  34      } else {
  35          lib_replace.match = $$rplbase/lib
  36 -        lib_replace.replace = $$qqt_libdir
  37 +        lib_replace.replace = $$qt_libdir
  38      }
  39      lib_replace.CONFIG = path
  40      QMAKE_PRL_INSTALL_REPLACE += lib_replace
  41 -    !equals(qt_libdir, $$rplbase/lib) {
  42 -        qtlibdir_replace.match = $$qt_libdir
  43 -        qtlibdir_replace.replace = $$qqt_libdir
  44 -        qtlibdir_replace.CONFIG = path
  45 -        QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
  46 -    }
  47  }
  48  contains(TEMPLATE, .*lib)|darwin {
  49      if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols
  50 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
  51 index 828a9621b9..b9e5d35026 100644
  52 --- a/mkspecs/features/qt_module.prf
  53 +++ b/mkspecs/features/qt_module.prf
  54 @@ -305,10 +305,7 @@ load(qt_targets)
  55  }
  56  !lib_bundle:unix {
  57      CONFIG += create_libtool
  58 -    host_build: \
  59 -        QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
  60 -    else: \
  61 -        QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
  62 +    QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib
  63      !isEmpty(lib_replace0.match) {
  64          ltlib_replace0.match = $$lib_replace0.match
  65          ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
  66 --
  67 2.25.4
  68