commit 5aa78f89f029200ce4e882e29389fb6d58ccdee5 · pyrox.dev/nixpkgs

+6 -4

pkgs/development/libraries/qt-6/default.nix

···

       40
       40
        
               inherit developerBuild;

     

       41
       41
        
               inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit;

     

       42
       42
        
               patches = [

     

       43
       43
       -
                 ./patches/qtbase-qmake-mkspecs-mac.patch

     

       44
       44
       -
                 ./patches/qtbase-qmake-pkg-config.patch

     

       45
       45
       -
                 ./patches/qtbase-tzdir.patch

     

       46
       46
       -
                 ./patches/qtbase-variable-fonts.patch

     

       43
       43
       +
                 ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch

     

       44
       44
       +
                 ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch

     

       45
       45
       +
                 ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch

     

       46
       46
       +
                 ./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch

     

       47
       47
       +
                 ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

     

       48
       48
       +
                 ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch

     

       47
       49
        
                 # Remove symlink check causing build to bail out and fail.

     

       48
       50
        
                 # https://gitlab.kitware.com/cmake/cmake/-/issues/23251

     

       49
       51
        
                 (fetchpatch {

+50

pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch

···

       1
       1
       +
       From 8880bc263a366aeb82056f0bf3f1b17b6ec26900 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Nick Cao <nickcao@nichi.co>

     

       3
       3
       +
       Date: Thu, 13 Apr 2023 23:42:29 +0800

     

       4
       4
       +
       Subject: [PATCH 1/6] qtbase: qmake: always use libname instead of absolute

     

       5
       5
       +
        path in qmake files

     

       6
       6
       +
       

     

       7
       7
       +
       In generated qmake files, absolute paths to qt libraries are embedded

     

       8
       8
       +
       and then used in linker flags. However as the libraries can be provided

     

       9
       9
       +
       by qt modules other than the one currently being built, the ebedded

     

       10
       10
       +
       paths can be incorrect.

     

       11
       11
       +
       ---

     

       12
       12
       +
        cmake/QtFinishPrlFile.cmake      | 7 ++++---

     

       13
       13
       +
        cmake/QtGenerateLibHelpers.cmake | 3 ---

     

       14
       14
       +
        2 files changed, 4 insertions(+), 6 deletions(-)

     

       15
       15
       +
       

     

       16
       16
       +
       diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake

     

       17
       17
       +
       index 32169e418c..4e754af367 100644

     

       18
       18
       +
       --- a/cmake/QtFinishPrlFile.cmake

     

       19
       19
       +
       +++ b/cmake/QtFinishPrlFile.cmake

     

       20
       20
       +
       @@ -61,9 +61,10 @@ foreach(line ${lines})

     

       21
       21
       +
                                endif()

     

       22
       22
       +
                                list(APPEND adjusted_libs "-framework" "${CMAKE_MATCH_1}")

     

       23
       23
       +
                            else()

     

       24
       24
       +
       -                        # Not a framework, transform the Qt module into relocatable relative path.

     

       25
       25
       +
       -                        qt_strip_library_version_suffix(relative_lib "${relative_lib}")

     

       26
       26
       +
       -                        list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS]/${relative_lib}")

     

       27
       27
       +
       +                        # Not a framework, extract the library name and prepend an -l to make

     

       28
       28
       +
       +                        # it relocatable.

     

       29
       29
       +
       +                        qt_transform_absolute_library_paths_to_link_flags(lib_with_link_flag "${lib}")

     

       30
       30
       +
       +                        list(APPEND adjusted_libs "${lib_with_link_flag}")

     

       31
       31
       +
                            endif()

     

       32
       32
       +
                        endif()

     

       33
       33
       +
                    else()

     

       34
       34
       +
       diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake

     

       35
       35
       +
       index e3f4bbf881..f8bd26acc7 100644

     

       36
       36
       +
       --- a/cmake/QtGenerateLibHelpers.cmake

     

       37
       37
       +
       +++ b/cmake/QtGenerateLibHelpers.cmake

     

       38
       38
       +
       @@ -70,9 +70,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_

     

       39
       39
       +
                    string(TOLOWER "${dir}" dir_lower)

     

       40
       40
       +
                    # If library_path isn't in default link directories, we should add it to link flags.

     

       41
       41
       +
                    list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index)

     

       42
       42
       +
       -            if(${index} EQUAL -1)

     

       43
       43
       +
       -                list(APPEND out_list "-L\"${dir}\"")

     

       44
       44
       +
       -            endif()

     

       45
       45
       +
                    list(APPEND out_list "${lib_name_with_link_flag}")

     

       46
       46
       +
                else()

     

       47
       47
       +
                    list(APPEND out_list "${library_path}")

     

       48
       48
       +
       -- 

     

       49
       49
       +
       2.39.2

     

       50
       50
       +

+26

pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch

···

       1
       1
       +
       From bc91f05db85b774f26d6bce86e2e618dfc7a6883 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Nick Cao <nickcao@nichi.co>

     

       3
       3
       +
       Date: Fri, 14 Apr 2023 09:34:46 +0800

     

       4
       4
       +
       Subject: [PATCH 3/6] qtbase: qmake: fix includedir in generated pkg-config

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        qmake/generators/makefile.cpp | 3 +--

     

       8
       8
       +
        1 file changed, 1 insertion(+), 2 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp

     

       11
       11
       +
       index da585bd9b2..3abf9cee83 100644

     

       12
       12
       +
       --- a/qmake/generators/makefile.cpp

     

       13
       13
       +
       +++ b/qmake/generators/makefile.cpp

     

       14
       14
       +
       @@ -3402,8 +3402,7 @@ MakefileGenerator::writePkgConfigFile()

     

       15
       15
       +
              << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")

     

       16
       16
       +
                //      << varGlue("DEFINES","-D"," -D"," ")

     

       17
       17
       +
                 ;

     

       18
       18
       +
       -    if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))

     

       19
       19
       +
       -        t << "-I${includedir}";

     

       20
       20
       +
       +    t << "-I${includedir}";

     

       21
       21
       +
            if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")

     

       22
       22
       +
                && libDir != QLatin1String("/Library/Frameworks")) {

     

       23
       23
       +
                    t << " -F${libdir}";

     

       24
       24
       +
       -- 

     

       25
       25
       +
       2.39.2

     

       26
       26
       +

+32

pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch

···

       1
       1
       +
       From f0017e872297168ab616096180891c7f312ef1a1 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Nick Cao <nickcao@nichi.co>

     

       3
       3
       +
       Date: Wed, 12 Apr 2023 10:13:50 +0800

     

       4
       4
       +
       Subject: [PATCH 6/6] qtbase: qt-cmake: always use cmake from path

     

       5
       5
       +
       

     

       6
       6
       +
       The generated qt-cmake scripts embeds the absolute path of cmake used

     

       7
       7
       +
       during the build of qtbase, bloating the runtime closure of qtbase.

     

       8
       8
       +
       ---

     

       9
       9
       +
        bin/qt-cmake.in | 7 +------

     

       10
       10
       +
        1 file changed, 1 insertion(+), 6 deletions(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in

     

       13
       13
       +
       index f719257f60..571ffe788f 100755

     

       14
       14
       +
       --- a/bin/qt-cmake.in

     

       15
       15
       +
       +++ b/bin/qt-cmake.in

     

       16
       16
       +
       @@ -4,12 +4,7 @@

     

       17
       17
       +
        script_dir_path=`dirname $0`

     

       18
       18
       +
        script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`

     

       19
       19
       +
        

     

       20
       20
       +
       -# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.

     

       21
       21
       +
       -original_cmake_path="@CMAKE_COMMAND@"

     

       22
       22
       +
       -cmake_path=$original_cmake_path

     

       23
       23
       +
       -if ! test -f "$cmake_path"; then

     

       24
       24
       +
       -    cmake_path="cmake"

     

       25
       25
       +
       -fi

     

       26
       26
       +
       +cmake_path="cmake"

     

       27
       27
       +
        

     

       28
       28
       +
        toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake"

     

       29
       29
       +
        

     

       30
       30
       +
       -- 

     

       31
       31
       +
       2.39.2

     

       32
       32
       +

+23 -6

pkgs/development/libraries/qt-6/patches/qtbase-qmake-mkspecs-mac.patch pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch

···

       1
       1
       +
       From 034db4e75ec749ac78fcf8235fa659b0eca83c30 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Nick Cao <nickcao@nichi.co>

     

       3
       3
       +
       Date: Fri, 14 Apr 2023 09:34:08 +0800

     

       4
       4
       +
       Subject: [PATCH 2/6] qtbase: qmake: fix mkspecs for darwin

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        mkspecs/common/mac.conf               |   2 +-

     

       8
       8
       +
        mkspecs/features/mac/default_post.prf | 263 --------------------------

     

       9
       9
       +
        mkspecs/features/mac/default_pre.prf  |  58 ------

     

       10
       10
       +
        mkspecs/features/mac/sdk.mk           |  27 ---

     

       11
       11
       +
        mkspecs/features/mac/sdk.prf          |  61 ------

     

       12
       12
       +
        mkspecs/features/mac/toolchain.prf    |   5 -

     

       13
       13
       +
        6 files changed, 1 insertion(+), 415 deletions(-)

     

       14
       14
       +
       

     

       1
       15
        
       diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf

     

       2
       2
       -
       index 61bea952..9909dae7 100644

     

       16
       16
       +
       index 61bea952b2..9909dae726 100644

     

       3
       17
        
       --- a/mkspecs/common/mac.conf

     

       4
       18
        
       +++ b/mkspecs/common/mac.conf

     

       5
       19
        
       @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL     = \

     
···

       12
       26
        
        

     

       13
       27
        
        QMAKE_LFLAGS_REL_RPATH  =

     

       14
       28
        
       diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf

     

       15
       15
       -
       index 09db1764..aadfce87 100644

     

       29
       29
       +
       index 09db1764b1..aadfce875e 100644

     

       16
       30
        
       --- a/mkspecs/features/mac/default_post.prf

     

       17
       31
        
       +++ b/mkspecs/features/mac/default_post.prf

     

       18
       32
        
       @@ -1,9 +1,5 @@

     
···

       299
       313
        
            generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS

     

       300
       314
        
            generate_xcode_project.target = xcodeproj

     

       301
       315
        
       diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf

     

       302
       302
       -
       index e3534561..3b01424e 100644

     

       316
       316
       +
       index e3534561a5..3b01424e67 100644

     

       303
       317
        
       --- a/mkspecs/features/mac/default_pre.prf

     

       304
       318
        
       +++ b/mkspecs/features/mac/default_pre.prf

     

       305
       319
        
       @@ -1,60 +1,2 @@

     
···

       364
       378
        
       -xcode_copy_phase_strip_setting.value = NO

     

       365
       379
        
       -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting

     

       366
       380
        
       diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk

     

       367
       367
       -
       index a32ceacb..e69de29b 100644

     

       381
       381
       +
       index a32ceacb6c..e69de29bb2 100644

     

       368
       382
        
       --- a/mkspecs/features/mac/sdk.mk

     

       369
       383
        
       +++ b/mkspecs/features/mac/sdk.mk

     

       370
       384
        
       @@ -1,27 +0,0 @@

     
···

       396
       410
        
       -    endif

     

       397
       411
        
       -endif

     

       398
       412
        
       diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf

     

       399
       399
       -
       index 3a9c2778..e69de29b 100644

     

       413
       413
       +
       index 3a9c2778bb..e69de29bb2 100644

     

       400
       414
        
       --- a/mkspecs/features/mac/sdk.prf

     

       401
       415
        
       +++ b/mkspecs/features/mac/sdk.prf

     

       402
       416
        
       @@ -1,61 +0,0 @@

     
···

       462
       476
        
       -    cache($$tool_variable, set stash, $$tool)

     

       463
       477
        
       -}

     

       464
       478
        
       diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf

     

       465
       465
       -
       index df191eb1..e69de29b 100644

     

       479
       479
       +
       index df191eb13c..e69de29bb2 100644

     

       466
       480
        
       --- a/mkspecs/features/mac/toolchain.prf

     

       467
       481
        
       +++ b/mkspecs/features/mac/toolchain.prf

     

       468
       482
        
       @@ -1,5 +0,0 @@

     
···

       471
       485
        
       -sdk: load(sdk)

     

       472
       486
        
       -

     

       473
       487
        
       -load(toolchain)

     

       488
       488
       +
       -- 

     

       489
       489
       +
       2.39.2

     

       490
       490
       +

-14

pkgs/development/libraries/qt-6/patches/qtbase-qmake-pkg-config.patch

···

       1
       1
       -
       diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp

     

       2
       2
       -
       --- a/qmake/generators/makefile.cpp

     

       3
       3
       -
       +++ b/qmake/generators/makefile.cpp

     

       4
       4
       -
       @@ -3390,8 +3390,7 @@ MakefileGenerator::writePkgConfigFile()

     

       5
       5
       -
              << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")

     

       6
       6
       -
                //      << varGlue("DEFINES","-D"," -D"," ")

     

       7
       7
       -
                 ;

     

       8
       8
       -
       -    if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))

     

       9
       9
       -
       -        t << "-I${includedir}";

     

       10
       10
       -
       +    t << "-I${includedir}";

     

       11
       11
       -
            if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")

     

       12
       12
       -
                && libDir != QLatin1String("/Library/Frameworks")) {

     

       13
       13
       -
                    t << " -F${libdir}";

     

       14
       14
       -

+14 -2

pkgs/development/libraries/qt-6/patches/qtbase-tzdir.patch pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch

···

       1
       1
       +
       From d612c1d7161f95864b9383df84b16d8c24fbcc9b Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Nick Cao <nickcao@nichi.co>

     

       3
       3
       +
       Date: Fri, 14 Apr 2023 09:35:25 +0800

     

       4
       4
       +
       Subject: [PATCH 4/6] qtbase: fix locating tzdir on NixOS

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/corelib/time/qtimezoneprivate_tz.cpp | 27 +++++++++++++++---------

     

       8
       8
       +
        1 file changed, 17 insertions(+), 10 deletions(-)

     

       9
       9
       +
       

     

       1
       10
        
       diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp

     

       2
       2
       -
       index 627a4a81..a5f50acc 100644

     

       11
       11
       +
       index e87e34f76d..39bd79d4a4 100644

     

       3
       12
        
       --- a/src/corelib/time/qtimezoneprivate_tz.cpp

     

       4
       13
        
       +++ b/src/corelib/time/qtimezoneprivate_tz.cpp

     

       5
       14
        
       @@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;

     
···

       15
       24
        
            if (!QFile::exists(path))

     

       16
       25
        
                path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");

     

       17
       26
        
        

     

       18
       18
       -
       @@ -727,18 +731,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)

     

       27
       27
       +
       @@ -729,18 +733,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)

     

       19
       28
        
                if (!tzif.open(QIODevice::ReadOnly))

     

       20
       29
        
                    return ret;

     

       21
       30
        
            } else {

     
···

       46
       55
        
                    }

     

       47
       56
        
                }

     

       48
       57
        
            }

     

       58
       58
       +
       -- 

     

       59
       59
       +
       2.39.2

     

       60
       60
       +

+3 -3

pkgs/development/libraries/qt-6/patches/qtbase-variable-fonts.patch pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

···

       1
       1
       -
       From 9ba9c690fb16188ff524b53def104e68e45cf5c3 Mon Sep 17 00:00:00 2001

     

       1
       1
       +
       From 5bd3672c7870b2e46e2a734dc9a9cb1837375a1c Mon Sep 17 00:00:00 2001

     

       2
       2
        
       From: Nick Cao <nickcao@nichi.co>

     

       3
       3
        
       Date: Tue, 21 Mar 2023 15:48:49 +0800

     

       4
       4
       -
       Subject: [PATCH] Deal with a font face at index 0 as Regular for Variable

     

       5
       5
       -
        fonts

     

       4
       4
       +
       Subject: [PATCH 5/6] qtbase: deal with a font face at index 0 as Regular for

     

       5
       5
       +
        Variable fonts

     

       6
       6
        
       

     

       7
       7
        
       Reference: https://bugreports.qt.io/browse/QTBUG-111994

     

       8
       8
        
       ---