Add mingw32 support qtbase #287077
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| , patches ? [ ] | ||
| , version | ||
| , coreutils | ||
| , buildPackages | ||
| , bison | ||
| , flex | ||
| , gdb | ||
|
|
@@ -79,6 +80,8 @@ | |
| , EventKit | ||
| , GSS | ||
| , MetalKit | ||
| # mingw | ||
| , pkgsBuildBuild | ||
| # optional dependencies | ||
| , cups | ||
| , libmysqlclient | ||
|
|
@@ -96,6 +99,7 @@ | |
|
|
||
| let | ||
| debugSymbols = debug || developerBuild; | ||
| isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; | ||
| in | ||
| stdenv.mkDerivation rec { | ||
| pname = "qtbase"; | ||
|
|
@@ -110,7 +114,6 @@ stdenv.mkDerivation rec { | |
| openssl | ||
| sqlite | ||
| zlib | ||
| # Text rendering | ||
| harfbuzz | ||
| icu | ||
|
|
@@ -119,14 +122,16 @@ stdenv.mkDerivation rec { | |
| libpng | ||
| pcre2 | ||
| pcre | ||
| zstd | ||
| libb2 | ||
| md4c | ||
| double-conversion | ||
|
There was a problem hiding this comment.
|
||
| ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ | ||
| libproxy | ||
| dbus | ||
| glib | ||
| # unixODBC drivers | ||
| unixODBC | ||
| unixODBCDrivers.psql | ||
| unixODBCDrivers.sqlite | ||
| unixODBCDrivers.mariadb | ||
|
|
@@ -174,21 +179,26 @@ stdenv.mkDerivation rec { | |
| EventKit | ||
| GSS | ||
| MetalKit | ||
| ] ++ lib.optionals libGLSupported [ | ||
| libGL | ||
| ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ | ||
| vulkan-headers | ||
| vulkan-loader | ||
| ]; | ||
|
Comment on lines
+184
to
+187
There was a problem hiding this comment. Why only for mingw? Shall we also add vulkan support to linux builds? There was a problem hiding this comment. This isn't a mingw only thing. See nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix Lines 142 to 143 in b5c9562 |
||
|
|
||
| buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ | ||
| at-spi2-core | ||
| ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [ | ||
| libinput | ||
| ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ | ||
| AppKit | ||
| CoreBluetooth | ||
| ] | ||
| ++ lib.optional withGtk3 gtk3 | ||
| ++ lib.optional developerBuild gdb | ||
| ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups | ||
| ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient | ||
| ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; | ||
|
|
||
| nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] | ||
| ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; | ||
|
|
@@ -203,7 +213,7 @@ stdenv.mkDerivation rec { | |
|
|
||
| # https://bugreports.qt.io/browse/QTBUG-97568 | ||
| postPatch = '' | ||
| substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${buildPackages.coreutils}/bin/ls" | ||
| '' + lib.optionalString stdenv.hostPlatform.isDarwin '' | ||
| substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" | ||
| ''; | ||
|
|
@@ -232,7 +242,11 @@ stdenv.mkDerivation rec { | |
| ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ | ||
| # error: 'path' is unavailable: introduced in macOS 10.15 | ||
| "-DQT_FEATURE_cxx17_filesystem=OFF" | ||
| ] ++ lib.optionals isCrossBuild [ | ||
| "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" | ||
| "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo" | ||
|
Comment on lines
+246
to
+247
There was a problem hiding this comment. If these paths are explicitly set, maybe there's no need to put it in depsBuildBuild? (Also causes inf recursion.) There was a problem hiding this comment. You are correct. Logic updated to only include this when stdenv.hostPlatform != stdenv.buildPlatform. Fixed. |
||
| ] | ||
| ++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; | ||
|
|
||
| env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ | ||
| # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" | ||
|
|
@@ -253,13 +267,15 @@ stdenv.mkDerivation rec { | |
|
|
||
| dontStrip = debugSymbols; | ||
|
|
||
| dontWrapQtApps = true; | ||
|
|
||
| setupHook = ../hooks/qtbase-setup-hook.sh; | ||
|
|
||
| meta = with lib; { | ||
| homepage = "https://www.qt.io/"; | ||
| description = "A cross-platform application framework for C++"; | ||
| license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; | ||
| maintainers = with maintainers; [ milahu nickcao LunNova ]; | ||
| platforms = platforms.unix ++ platforms.windows; | ||
| }; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't gtk3 available on mingw?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then, using
!lib.meta.availableOn stdenv.hostPlatform gtk3is more appropriate.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there is a bug in the in the gtk3 package
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No change since gtk3 appears to indicate it has mingw support when in fact it doesn't.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We really should fix this on the gtk3 side.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My hope is that we can leave the mingw conditional for now to get initial mingw support for qtbase. When gtk3 actually has mingw support, we can change that line. I suspect that adding mingw support for gtk3 may not be trivial.