qt6: don't treat absolute paths without known suffix as library

NixOS · Dec 21, 2024 · 0f7cfda · 0f7cfda
1 parent c7893fc
commit 0f7cfda
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
@@ -75,6 +75,7 @@ let
           ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch
           ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch
           ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch
+          ./patches/0011-qtbase-dont-treat-abspaths-without-suffix-as-libraries.patch
           # Backport patch for https://bugs.kde.org/show_bug.cgi?id=493116
           # FIXME: remove for 6.8.1
           (fetchpatch2 {

diff --git a/.../libraries/qt-6/patches/0011-qtbase-dont-treat-abspaths-without-suffix-as-libraries.patch b/.../libraries/qt-6/patches/0011-qtbase-dont-treat-abspaths-without-suffix-as-libraries.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake
+index 96675267d2..c9d4a69497 100644
+--- a/cmake/QtGenerateLibHelpers.cmake
++++ b/cmake/QtGenerateLibHelpers.cmake
+@@ -10,7 +10,7 @@ function(qt_get_library_name_without_prefix_and_suffix out_var file_path)
+     if(NOT file_path MATCHES "^-") # not a linker flag
+         get_filename_component(basename "${file_path}" NAME_WE)
+         get_filename_component(ext "${file_path}" EXT)
+-        if(NOT ext) # seems like a library name without prefix and suffix
++        if(NOT ext AND NOT IS_ABSOLUTE "${file_path}") # seems like a library name without prefix and suffix
+             set(${out_var} "${file_path}" PARENT_SCOPE)
+             return()
+         endif()