Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mingw32 support qtbase #287077

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Conversation

seanybaggins
Copy link
Contributor

Description of changes

Waiting for #285661 to land in master.
See also https://nixpk.gs/pr-tracker.html?pr=285661
Relevant for #272538 and #274274

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@LunNova
Copy link
Member

LunNova commented Feb 8, 2024

@ofborg build pkgsCross.mingw32.qt6.qtbase

edit: need to rerun this once the commit it depends on reaches master

@seanybaggins
Copy link
Contributor Author

Given the rebuild count, should I be targeting the staging branch?

@NickCao
Copy link
Member

NickCao commented Feb 8, 2024

Given the rebuild count, should I be targeting the staging branch?

No, below 500 is fine for master.

@seanybaggins seanybaggins changed the title Draft: Add mingw32 support qtbase Add mingw32 support qtbase Feb 13, 2024
@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingw32.qt6.qtbase

@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingwW64.qt6.qtbase

@seanybaggins seanybaggins force-pushed the add-mingw32-support-qtbase branch from ca88b68 to d8f8ba2 Compare February 15, 2024 00:03
@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingw32.qt6.qtbase

@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingwW64.qt6.qtbase

@@ -42,7 +42,7 @@ let
qtModule = callPackage ./qtModule.nix { };

qtbase = callPackage ./modules/qtbase.nix {
withGtk3 = true;
withGtk3 = (!stdenv.hostPlatform.isMinGW);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unneeded parenthesis.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@seanybaggins
Copy link
Contributor Author

Just synced and rebased with main. Running nix build '.#pkgs.pkgsCross.mingw32.qt6.qtbase' build successfully. I don't know why ofborg is failing to build.

@seanybaggins seanybaggins force-pushed the add-mingw32-support-qtbase branch from d8f8ba2 to a964579 Compare February 15, 2024 17:23
@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingw32.qt6.qtbase

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 16, 2024
@seanybaggins seanybaggins force-pushed the add-mingw32-support-qtbase branch from a964579 to 84c6e1e Compare February 16, 2024 19:36
@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingw32.qt6.qtbase

@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingwW64.qt6.qtbase

@seanybaggins
Copy link
Contributor Author

seanybaggins commented Feb 19, 2024

Pinging @NickCao @LunNova @bjornfor Looks like there is a check within the cmake files for symlinks for a build platform of Darwin. All other builds seem to work. Can we mark that a buildPlatfrom build of Darwin will not work and get this merged? I don't have a Darwin system to trouble shoot this.

@LunNova
Copy link
Member

LunNova commented Feb 19, 2024

You mean specifically marking the combination of host darwin target mingw as broken? I didn't even know mingw worked on darwin 😅. Marking that broken seems fine.

I can't test anything on mac, will give this a review run on x64 and make sure a few apps still work there.

@seanybaggins
Copy link
Contributor Author

seanybaggins commented Feb 19, 2024

You mean specifically marking the combination of host darwin target mingw as broken? I didn't even know mingw worked on darwin 😅. Marking that broken seems fine.

I can't test anything on mac, will give this a review run on x64 and make sure a few apps still work there.

Just to make sure there is no confusion, what I mean is, if your build platfrom is darwin and your host platform is mingw then the build will fail.

@LunNova
Copy link
Member

LunNova commented Feb 19, 2024

@ofborg build citra-canary

Copy link
Member

@LunNova LunNova left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Packages I use frequently seem fine, not seeing regressions for x64 linux.

I'm not great with Nix cross compilation so I haven't thoroughly reviewed the change for that. Nothing's standing out as wrong.

@@ -42,7 +42,7 @@ let
qtModule = callPackage ./qtModule.nix { };

qtbase = callPackage ./modules/qtbase.nix {
withGtk3 = true;
withGtk3 = !stdenv.hostPlatform.isMinGW;
Copy link
Member

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope

nix build '.#pkgs.pkgsCross.mingw32.gtk3'

error:
       … while calling the 'derivationStrict' builtin

         at /builtin/derivation.nix:9:12: (source not available)

       … while evaluating derivation 'gtk+3-i686-w64-mingw32-3.24.39'
         whose name attribute is located at /nix/store/kp890n9higzcq3n6bzqimvnl2qkx5i1v-source/pkgs/stdenv/generic/make-derivation.nix:353:7

       … while evaluating attribute 'buildInputs' of derivation 'gtk+3-i686-w64-mingw32-3.24.39'

         at /nix/store/kp890n9higzcq3n6bzqimvnl2qkx5i1v-source/pkgs/stdenv/generic/make-derivation.nix:400:7:

          399|       depsHostHost                = elemAt (elemAt dependencies 1) 0;
          400|       buildInputs                 = elemAt (elemAt dependencies 1) 1;
             |       ^
          401|       depsTargetTarget            = elemAt (elemAt dependencies 2) 0;

       error: Package ‘libxkbcommon-1.5.0’ in /nix/store/kp890n9higzcq3n6bzqimvnl2qkx5i1v-source/pkgs/development/libraries/libxkbcommon/default.nix:53 is not available on the requested hostPlatform:
         hostPlatform.config = "i686-w64-mingw32"
         package.meta.platforms = [
           "i686-cygwin"
           "x86_64-cygwin"
           "x86_64-darwin"
           "i686-darwin"
           "aarch64-darwin"
           "armv7a-darwin"
           "i686-freebsd13"
           "x86_64-freebsd13"
           "x86_64-solaris"
           "aarch64-linux"
           "armv5tel-linux"
           "armv6l-linux"
           "armv7a-linux"
           "armv7l-linux"
           "i686-linux"
           "loongarch64-linux"
           "m68k-linux"
           "microblaze-linux"
           "microblazeel-linux"
           "mips-linux"
           "mips64-linux"
           "mips64el-linux"
           "mipsel-linux"
           "powerpc64-linux"
           "powerpc64le-linux"
           "riscv32-linux"
           "riscv64-linux"
           "s390-linux"
           "s390x-linux"
           "x86_64-linux"
           "aarch64-netbsd"
           "armv6l-netbsd"
           "armv7a-netbsd"
           "armv7l-netbsd"
           "i686-netbsd"
           "m68k-netbsd"
           "mipsel-netbsd"
           "powerpc-netbsd"
           "riscv32-netbsd"
           "riscv64-netbsd"
           "x86_64-netbsd"
           "i686-openbsd"
           "x86_64-openbsd"
           "x86_64-redox"
         ]
         package.meta.badPlatforms = [ ]
       , refusing to evaluate.

       a) To temporarily allow packages that are unsupported for this system, you can use an environment variable
          for a single invocation of the nix tools.

            $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1

          Note: When using `nix shell`, `nix build`, `nix develop`, etc with a flake,
                then pass `--impure` in order to allow use of environment variables.

       b) For `nixos-rebuild` you can set
         { nixpkgs.config.allowUnsupportedSystem = true; }
       in configuration.nix to override this.

       c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
         { allowUnsupportedSystem = true; }
       to ~/.config/nixpkgs/config.nix.

Copy link
Member

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 gtk3 is more appropriate.

Copy link
Contributor Author

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

nix-repl> lib.meta.availableOn pkgsCross.mingw32.stdenv.hostPlatform gtk3
true


nix-repl> :b pkgsCross.mingw32.gtk3
error:
       … while calling the 'derivationStrict' builtin

         at /builtin/derivation.nix:9:12: (source not available)

       … while evaluating derivation 'gtk+3-i686-w64-mingw32-3.24.39'
         whose name attribute is located at /home/sean/nixpkgs-contributing/pkgs/stdenv/generic/make-derivation.nix:353:7

       … while evaluating attribute 'buildInputs' of derivation 'gtk+3-i686-w64-mingw32-3.24.39'

         at /home/sean/nixpkgs-contributing/pkgs/stdenv/generic/make-derivation.nix:400:7:

          399|       depsHostHost                = elemAt (elemAt dependencies 1) 0;
          400|       buildInputs                 = elemAt (elemAt dependencies 1) 1;
             |       ^
          401|       depsTargetTarget            = elemAt (elemAt dependencies 2) 0;

       error: Package ‘libxkbcommon-1.5.0’ in /home/sean/nixpkgs-contributing/pkgs/development/libraries/libxkbcommon/default.nix:60 is not available on the requested hostPlatform:
         hostPlatform.config = "i686-w64-mingw32"
         package.meta.platforms = [
           "i686-cygwin"
           "x86_64-cygwin"
           "x86_64-darwin"
           "i686-darwin"
           "aarch64-darwin"
           "armv7a-darwin"
           "i686-freebsd13"
           "x86_64-freebsd13"
           "x86_64-solaris"
           "aarch64-linux"
           "armv5tel-linux"
           "armv6l-linux"
           "armv7a-linux"
           "armv7l-linux"
           "i686-linux"
           "loongarch64-linux"
           "m68k-linux"
           "microblaze-linux"
           "microblazeel-linux"
           "mips-linux"
           "mips64-linux"
           "mips64el-linux"
           "mipsel-linux"
           "powerpc64-linux"
           "powerpc64le-linux"
           "riscv32-linux"
           "riscv64-linux"
           "s390-linux"
           "s390x-linux"
           "x86_64-linux"
           "aarch64-netbsd"
           "armv6l-netbsd"
           "armv7a-netbsd"
           "armv7l-netbsd"
           "i686-netbsd"
           "m68k-netbsd"
           "mipsel-netbsd"
           "powerpc-netbsd"
           "riscv32-netbsd"
           "riscv64-netbsd"
           "x86_64-netbsd"
           "i686-openbsd"
           "x86_64-openbsd"
           "x86_64-redox"
         ]
         package.meta.badPlatforms = [ ]
       , refusing to evaluate.

       a) To temporarily allow packages that are unsupported for this system, you can use an environment variable
          for a single invocation of the nix tools.

            $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1

          Note: When using `nix shell`, `nix build`, `nix develop`, etc with a flake,
                then pass `--impure` in order to allow use of environment variables.

       b) For `nixos-rebuild` you can set
         { nixpkgs.config.allowUnsupportedSystem = true; }
       in configuration.nix to override this.

       c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
         { allowUnsupportedSystem = true; }
       to ~/.config/nixpkgs/config.nix.

Copy link
Contributor Author

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.

Copy link
Member

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.

Copy link
Contributor Author

@seanybaggins seanybaggins Feb 27, 2024

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.

qtwebsockets
qtwebview
] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) { };
full = callPackage
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please drop the formatting changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reconsider this one. Commits have been separated between the formatting and adding mingw support. This is what I have done for every merge request mentioned in these issues
#274274
#272538

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine then.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a bug in nixpkgs-fmt that the after the callPackage a line break is added. Also it makes the entire PR looking bigger than it is.

pkgs/development/libraries/qt-6/modules/qtbase.nix Outdated Show resolved Hide resolved
Comment on lines +248 to +247
"-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
"-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If these paths are explicitly set, maybe there's no need to put it in depsBuildBuild? (Also causes inf recursion.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct. Logic updated to only include this when stdenv.hostPlatform != stdenv.buildPlatform. Fixed.

@NickCao
Copy link
Member

NickCao commented Feb 20, 2024

Found a dozen of problems in other packages when playing with this PR: #290086 #290087 #290089

@NickCao
Copy link
Member

NickCao commented Feb 20, 2024

And blanket fix for stdenv.is* invocations: #290094

@seanybaggins seanybaggins force-pushed the add-mingw32-support-qtbase branch from 84c6e1e to 987e38d Compare February 22, 2024 18:28
@ofborg ofborg bot requested review from LunNova and NickCao February 22, 2024 18:56
@seanybaggins
Copy link
Contributor Author

seanybaggins commented Feb 22, 2024

There was a regression introduced in #290266

Failure

 nix build 'github:nixos/nixpkgs/b5ec6b57951f45054a0f014e99a52d0e0fefffc8#pkgs.pkgsCross.mingw32.icu'

Success

nix build 'github:nixos/nixpkgs/c55877fec80f586f8205c98ae3024bcc05e04689#pkgs.pkgsCross.mingw32.icu'
git log --grep='icu'

@afh @7c6f434c @kirillrdy

@afh
Copy link
Member

afh commented Feb 23, 2024

Thank you for raising this, @seanybaggins.
Firstly and fortunately this is already being worked on in #290761.
Secondly apologies for introducing a regression, hopefully it isn't too disruptive.

@seanybaggins seanybaggins force-pushed the add-mingw32-support-qtbase branch 2 times, most recently from cfb46f9 to 2c154d3 Compare February 26, 2024 22:24
@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingw32.qt6.qtbase

@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingwW64.qt6.qtbase

@seanybaggins
Copy link
Contributor Author

@NickCao this is ready to be reviewed and hopefully merged in :)

Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the hardcoded stdenv.hostPlatform.isMinGW predicated should be replaced with either isCrossBuild or lib.meta.availableOn stdenv.hostPlatform <package>. Otherwise LGTM.

Comment on lines 96 to 97
, qttranslations ? null
, isCrossBuild ? stdenv.hostPlatform != stdenv.buildPlatform
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be stdenv.buildPlatform.canExecute stdenv.hostPlatform and be kept in the let .. in clause below (as there's no point in exposing this as an argument).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -42,7 +42,7 @@ let
qtModule = callPackage ./qtModule.nix { };

qtbase = callPackage ./modules/qtbase.nix {
withGtk3 = true;
withGtk3 = !stdenv.hostPlatform.isMinGW;
Copy link
Member

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.

libb2
md4c
] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
double-conversion
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

double-conversion is now supported on windows since #290089

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

at-spi2-core
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMinGW) [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMinGW) [
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Comment on lines 198 to 200
++ lib.optional (cups != null && !stdenv.hostPlatform.isMinGW) cups
++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
++ lib.optional (postgresql != null && !stdenv.hostPlatform.isMinGW) postgresql;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
++ lib.optional (cups != null && !stdenv.hostPlatform.isMinGW) cups
++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
++ lib.optional (postgresql != null && !stdenv.hostPlatform.isMinGW) postgresql;
++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups
++ lib.optional (libmysqlclient != null && lib.meta.availableOn stdenv.hostPlatform libmysqlclient) libmysqlclient
++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql;

Comment on lines +183 to +187
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
vulkan-headers
vulkan-loader
];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why only for mingw? Shall we also add vulkan support to linux builds?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a mingw only thing. See

vulkan-headers
vulkan-loader
. Vulkan appears to be unsupported for Darwin. Did the conditional at the bottom here to avoid triggering a mass rebuild.


buildInputs = [
buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [
buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@@ -202,7 +211,7 @@ stdenv.mkDerivation rec {
inherit patches;

# https://bugreports.qt.io/browse/QTBUG-97568
postPatch = ''
postPatch = lib.optionalString (!stdenv.hostPlatform.isMinGW) ''
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
postPatch = lib.optionalString (!stdenv.hostPlatform.isMinGW) ''
postPatch = ''

coreutils are executed on the build platform not the host platform.

@@ -202,7 +211,7 @@ stdenv.mkDerivation rec {
inherit patches;

# https://bugreports.qt.io/browse/QTBUG-97568
postPatch = ''
postPatch = lib.optionalString (!stdenv.hostPlatform.isMinGW) ''
substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls"
substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${buildPackages.coreutils}/bin/ls"

"-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
"-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo"
]
++ lib.optional (qttranslations != null && !stdenv.hostPlatform.isMinGW) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
++ lib.optional (qttranslations != null && !stdenv.hostPlatform.isMinGW) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";
++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";

@ofborg ofborg bot requested a review from NickCao February 26, 2024 23:06
@afh
Copy link
Member

afh commented Feb 27, 2024

FYI: #290761 has been merged. @seanybaggins have the changes from that PR found their way into this PR and did they address the issues you were observing?

@seanybaggins
Copy link
Contributor Author

FYI: #290761 has been merged. @seanybaggins have the changes from that PR found their way into this PR and did they address the issues you were observing?

Your PR worked. Now able to build again :)

@afh
Copy link
Member

afh commented Feb 27, 2024

Thanks for confirming, @seanybaggins, much appreciated and much success with this PR!
Credit where credit is due: #290761 is the work of uninsane 🙏

@seanybaggins seanybaggins force-pushed the add-mingw32-support-qtbase branch from 2c154d3 to fd9c0ae Compare February 27, 2024 20:06
@seanybaggins seanybaggins force-pushed the add-mingw32-support-qtbase branch from fd9c0ae to 174ca6a Compare February 27, 2024 20:17
@seanybaggins
Copy link
Contributor Author

@NickCao ready for another round.

@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingw32.qt6.qtbase

@seanybaggins
Copy link
Contributor Author

@ofborg build pkgs.pkgsCross.mingwW64.qtbase

Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM, some nitpicks can be handled later. I intend to merge this after the plasma 6 update to reduce the risk of introducing breakages (and rebuilds for the testers).

@seanybaggins
Copy link
Contributor Author

When is the plasma 6 update? Are you able to link to something?

@bjornfor
Copy link
Contributor

When is the plasma 6 update? Are you able to link to something?

Must be this: #286522 (merged two hours ago).

@NickCao
Copy link
Member

NickCao commented Feb 28, 2024

Now running nixpkgs-review.

@NickCao
Copy link
Member

NickCao commented Feb 29, 2024

Didn't finish nixpkgs-review, but looks clean.

@NickCao NickCao merged commit e487dbc into NixOS:master Feb 29, 2024
31 checks passed
@seanybaggins seanybaggins deleted the add-mingw32-support-qtbase branch February 29, 2024 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants