mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-20 20:53:19 +02:00
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
|
Date: Wed, 18 Sep 2019 05:39:50 -0500
|
|
Subject: [PATCH 04/12] qtbase-replace-libdir
|
|
|
|
---
|
|
mkspecs/features/qt_common.prf | 20 ++------------------
|
|
mkspecs/features/qt_module.prf | 5 +----
|
|
2 files changed, 3 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
|
|
index caecb68a84..d3aa3ba570 100644
|
|
--- a/mkspecs/features/qt_common.prf
|
|
+++ b/mkspecs/features/qt_common.prf
|
|
@@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) {
|
|
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
|
|
else: \
|
|
rplbase = $$MODULE_BASE_OUTDIR
|
|
- host_build {
|
|
- qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
|
|
- qt_libdir = $$[QT_HOST_LIBS]
|
|
- } else {
|
|
- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]
|
|
- qt_libdir = $$[QT_INSTALL_LIBS]
|
|
- }
|
|
+ qt_libdir = $$NIX_OUTPUT_OUT/lib
|
|
contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
|
|
- lib_replace0.match = $$rplbase/lib/
|
|
- lib_replace0.replace = $$qqt_libdir/
|
|
- lib_replace0.CONFIG = path
|
|
- QMAKE_PRL_INSTALL_REPLACE += lib_replace0
|
|
lib_replace.match = "[^ ']*$$rplbase/lib"
|
|
lib_replace.replace =
|
|
} else {
|
|
lib_replace.match = $$rplbase/lib
|
|
- lib_replace.replace = $$qqt_libdir
|
|
+ lib_replace.replace = $$qt_libdir
|
|
}
|
|
lib_replace.CONFIG = path
|
|
QMAKE_PRL_INSTALL_REPLACE += lib_replace
|
|
- !equals(qt_libdir, $$rplbase/lib) {
|
|
- qtlibdir_replace.match = $$qt_libdir
|
|
- qtlibdir_replace.replace = $$qqt_libdir
|
|
- qtlibdir_replace.CONFIG = path
|
|
- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
|
|
- }
|
|
}
|
|
|
|
# The remainder of this file must not apply to host tools/libraries,
|
|
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
|
index ee7de22059..9015b30d73 100644
|
|
--- a/mkspecs/features/qt_module.prf
|
|
+++ b/mkspecs/features/qt_module.prf
|
|
@@ -303,10 +303,7 @@ load(qt_targets)
|
|
}
|
|
!lib_bundle:unix {
|
|
CONFIG += create_libtool
|
|
- host_build: \
|
|
- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
|
|
- else: \
|
|
- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
|
|
+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib
|
|
!isEmpty(lib_replace0.match) {
|
|
ltlib_replace0.match = $$lib_replace0.match
|
|
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
|
|
--
|
|
2.23.GIT
|
|
|