qt510-qtbase: fix darwin build #33989
Conversation
Includes most of the changes from 3793320, moved it to a separate patch to avoid accidental removal.
| @@ -37,7 +37,7 @@ let | |||
| srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; | |||
|
|
|||
| patches = { | |||
| qtbase = [ ./qtbase.patch ]; | |||
| qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch; | |||
There was a problem hiding this comment.
Does this patch need to be updated from version to version?
There was a problem hiding this comment.
Probably, this fixes compatibility issues with the opensource version of CoreFoundation.
There was a problem hiding this comment.
We could try, but I expect issues like these to keep creeping in if they don't test against it.
|
@ttuegel Should I include the patch in my pr (ttuegel/qtbase@9836550)? |
No, I already rebased onto a new branch. But as @LnL7 points out, this patch is already present in Qt 5.9 and was accidentally removed. Clearly my "one big patch from git diff" approach is not working. I'm going to go back to keeping individual patches in Nixpkgs Git and get rid of my repositories. |
Motivation for this change
Includes most of the changes from 3793320,
moved it to a separate patch to avoid accidental removal.
Only tested qtbase, but everything else worked fine with the qt510 update.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)