From 655d8440e56dfdd03c8b816f8f8446935bcfbc26 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 30 Oct 2022 14:51:07 +0100 Subject: [PATCH 8/8] ! gnu: qtbase-5: Apply qtbase-fix-header_module.patch. * gnu/packages/qt.scm (qtbase-5)[source]: Apply qtbase-fix-header_module.patch. * gnu/local.mk: Add patch. * gnu/packages/patches/qtbase-fix-header_module.patch: New file. diff --git a/gnu/local.mk b/gnu/local.mk index 8b6f0913d4..c5ca64e644 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1752,6 +1752,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-assert.patch \ %D%/packages/patches/qtbase-cmake.patch \ + %D%/packages/patches/qtbase-fix-header_module.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-qtpluginpath.patch \ %D%/packages/patches/qtbase-replace-libdir.patch \ diff --git a/gnu/packages/patches/qtbase-fix-header_module.patch b/gnu/packages/patches/qtbase-fix-header_module.patch new file mode 100644 index 0000000000..ed869244dc --- /dev/null +++ b/gnu/packages/patches/qtbase-fix-header_module.patch @@ -0,0 +1,26 @@ +From 2bce8511877db1db532e1437e7140b1d55633f86 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 30 Sep 2019 20:15:40 -0500 +Subject: [PATCH 11/11] fix header_module + +--- + mkspecs/features/qt_module.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index b9e5d35026..9924271042 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -84,7 +84,7 @@ header_module { + CONFIG += qt_no_install_library + + # Allow creation of .prl, .la and .pc files. +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + target.CONFIG += dummy_install + INSTALLS += target + } else { +-- +2.25.4 + + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 47f0db985c..5bf2354f1d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -300,6 +300,7 @@ (define-public qtbase-5 (patches (search-patches "qtbase-use-TZDIR.patch" "qtbase-assert.patch" "qtbase-cmake.patch" + "qtbase-fix-header_module.patch" "qtbase-qtpluginpath.patch" "qtbase-replace-libdir.patch" "qtbase-tbd-frameworks.patch" @@ -437,6 +438,10 @@ (define-public qtbase-5 (substitute* '("mkspecs/features/qt_common.prf" "mkspecs/features/qt_module.prf") (("..NIX_OUTPUT_OUT") #$output)) + ;; qtbase-fix-header_module.patch + (substitute* "mkspecs/features/qt_module.prf" + (("..NIX_OUTPUT_OUT") #$output)) + ;; qtbase-cmake.patch (substitute* (list "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" -- 2.37.2