qt512.qtbase: Replace libdir unconditionally

12 files changed, 96 insertions, 70 deletions

diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index e7cb7c37121..47a3589c2f9 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -57,13 +57,14 @@ let
       ]
       ++ [
         ./qtbase.patch.d/0003-qtbase-mkspecs.patch
-        ./qtbase.patch.d/0004-qtbase-cmake.patch
-        ./qtbase.patch.d/0005-qtbase-gtk3.patch
-        ./qtbase.patch.d/0006-qtbase-xcursor.patch
-        ./qtbase.patch.d/0007-qtbase-xcompose.patch
-        ./qtbase.patch.d/0008-qtbase-tzdir.patch
-        ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch
-        ./qtbase.patch.d/0010-qtbase-assert.patch
+        ./qtbase.patch.d/0004-qtbase-replace-libdir.patch
+        ./qtbase.patch.d/0005-qtbase-cmake.patch
+        ./qtbase.patch.d/0006-qtbase-gtk3.patch
+        ./qtbase.patch.d/0007-qtbase-xcursor.patch
+        ./qtbase.patch.d/0008-qtbase-xcompose.patch
+        ./qtbase.patch.d/0009-qtbase-tzdir.patch
+        ./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
+        ./qtbase.patch.d/0011-qtbase-assert.patch
       ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
index 70216a3c636..de3d68357c7 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@@ -1,7 +1,7 @@
 From 58d98b66da5d748d610f053053bd12e42c97d9e6 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:34:00 -0500
-Subject: [PATCH 01/10] qtbase-mkspecs-mac
+Subject: [PATCH 01/11] qtbase-mkspecs-mac
 
 ---
  mkspecs/common/mac.conf               |   2 +-
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
index b780e38fc83..60696d68813 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
@@ -1,7 +1,7 @@
 From 1dbf4dd6dc4cc30a3e705a12117f1764201a8402 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:37:15 -0500
-Subject: [PATCH 02/10] qtbase-mac
+Subject: [PATCH 02/11] qtbase-mac
 
 ---
  src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
index 41cf801c9c7..569cea0a3d5 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
@@ -1,7 +1,7 @@
-From cfcd1f6e1ac53bfbd7d35f0e1aefbdbaa1726f4d Mon Sep 17 00:00:00 2001
+From f02c0371160b5d90df4030fc55921c6acb0e6914 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Tue, 17 Sep 2019 05:32:35 -0500
-Subject: [PATCH 03/10] qtbase-mkspecs
+Date: Wed, 18 Sep 2019 05:39:39 -0500
+Subject: [PATCH 03/11] qtbase-mkspecs
 
 ---
  mkspecs/features/create_cmake.prf             | 53 ++++--------
@@ -10,13 +10,12 @@ Subject: [PATCH 03/10] qtbase-mkspecs
  mkspecs/features/qml_plugin.prf               |  2 +-
  mkspecs/features/qt_app.prf                   |  2 +-
  mkspecs/features/qt_build_paths.prf           |  4 +-
- mkspecs/features/qt_common.prf                | 31 -------
  mkspecs/features/qt_docs.prf                  | 10 +--
  mkspecs/features/qt_example_installs.prf      |  2 +-
  mkspecs/features/qt_functions.prf             |  2 +-
  mkspecs/features/qt_installs.prf              | 22 ++---
  mkspecs/features/qt_plugin.prf                |  2 +-
- 12 files changed, 39 insertions(+), 173 deletions(-)
+ 11 files changed, 39 insertions(+), 142 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
 index c9910dda..e9bc8076 100644
@@ -318,48 +317,6 @@ index 3bb3823a..655b7b7d 100644
 +    MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT
 +    MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
  }
-diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index caecb68a..dc5c2178 100644
---- a/mkspecs/features/qt_common.prf
-+++ b/mkspecs/features/qt_common.prf
-@@ -25,37 +25,6 @@ contains(TEMPLATE, .*lib) {
-     if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols
-     unix:qtConfig(reduce_relocations): CONFIG += bsymbolic_functions
-     qtConfig(separate_debug_info): CONFIG += separate_debug_info
--
--    !isEmpty(_QMAKE_SUPER_CACHE_): \
--        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]
--    }
--    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.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_docs.prf b/mkspecs/features/qt_docs.prf
 index 3b74cd4d..6bfbbe6e 100644
 --- a/mkspecs/features/qt_docs.prf
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
new file mode 100644
index 00000000000..0968c7adb20
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
@@ -0,0 +1,68 @@
+From ae6ea1bbc7ce46d0764ef7bc4109a8489102374b 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/11] 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 caecb68a..d3aa3ba5 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 51b5bde6..82e2907c 100644
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -292,10 +292,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
+     ltlib_replace.match = $$lib_replace.match
+     !isEmpty(lib_replace.replace): \
+         ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
+-- 
+2.22.1
+
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
index 73459af1649..0f6195cdb3b 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-cmake.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
@@ -1,7 +1,7 @@
-From 689670949eac83e1ba76425a1fc17efeb920eff1 Mon Sep 17 00:00:00 2001
+From d41d33acb53d54aee01c61e61a569687eadd78f8 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:34:28 -0500
-Subject: [PATCH 04/10] qtbase-cmake
+Subject: [PATCH 05/11] qtbase-cmake
 
 ---
  mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in  |  2 +-
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
index 9e82a2eeef9..3137179a0ec 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-gtk3.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
@@ -1,7 +1,7 @@
-From b4542d244adc118e8a84ee4ae1d737b5205da1e3 Mon Sep 17 00:00:00 2001
+From c3bb0602745fafade007d7d8cf1f3d5065e4ce11 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:35:33 -0500
-Subject: [PATCH 05/10] qtbase-gtk3
+Subject: [PATCH 06/11] qtbase-gtk3
 
 ---
  src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++-
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
index 21bb2408a3e..9f9ed9880af 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-xcursor.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
@@ -1,7 +1,7 @@
-From 6dfdf2044bc8a0212b14414c4b9d9c1bfa5c1e6b Mon Sep 17 00:00:00 2001
+From b8581b324f47f1e8e5b994ab138f2850583a9f6c Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:35:58 -0500
-Subject: [PATCH 06/10] qtbase-xcursor
+Subject: [PATCH 07/11] qtbase-xcursor
 
 ---
  src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcompose.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch
index 83d11494a01..e239cfff187 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcompose.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch
@@ -1,7 +1,7 @@
-From 7211024a1d54232f9a6f91f7aac467e0e8893691 Mon Sep 17 00:00:00 2001
+From e94cdbb790beb51babaa61e373f64bac96fcaee2 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:36:10 -0500
-Subject: [PATCH 07/10] qtbase-xcompose
+Subject: [PATCH 08/11] qtbase-xcompose
 
 ---
  .../compose/generator/qtablegenerator.cpp                    | 5 +----
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
index 5050ffea90d..95aefd9df7b 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
@@ -1,7 +1,7 @@
-From f24621e540d5511802013aa8e8972c9e060c953a Mon Sep 17 00:00:00 2001
+From 18e87f3de05ffbed6f5d9b4f9a3fc20373f4c06b Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:36:25 -0500
-Subject: [PATCH 08/10] qtbase-tzdir
+Subject: [PATCH 09/11] qtbase-tzdir
 
 ---
  src/corelib/tools/qtimezoneprivate_tz.cpp | 20 ++++++++++++++------
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
index 7226617872f..286daa01027 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-qtpluginpath.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
@@ -1,7 +1,7 @@
-From 40616bf4afacadca360083d7d365914f8f8573e5 Mon Sep 17 00:00:00 2001
+From 48617800cd7e27402126602d9aa90803a5b07dd2 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:36:41 -0500
-Subject: [PATCH 09/10] qtbase-qtpluginpath
+Subject: [PATCH 10/11] qtbase-qtpluginpath
 
 ---
  src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
index 943667b26e0..ddffbad8742 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-assert.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
@@ -1,7 +1,7 @@
-From 60a2d764708234a06828c76d91db77565e08d872 Mon Sep 17 00:00:00 2001
+From 4464f24a507b05ff7280f1161f33bbf3b645d17d Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@mailbox.org>
 Date: Tue, 17 Sep 2019 05:37:04 -0500
-Subject: [PATCH 10/10] qtbase-assert
+Subject: [PATCH 11/11] qtbase-assert
 
 ---
  src/testlib/qtestassert.h | 7 +++++--