mindforger: remove use of deprecated QtWebKit#122476
Conversation
|
Result of 1 package built successfully:
3 suggestions:
|
|
@cyplo Would you mind submitting your nice patch upstream? |
|
@SuperSandro2000 - not sure if splitting the arrays into multiple lines makes it more readable, is this more idiomatic ? Also - not sure if having @veprbl - yeah defo, once this lands in nixos I will submit upstream - ideally with someone giving this a go on a MacOS box before, as I don't have access to any. |
|
@cyplo The preferred way is to first have the patch upstream and then pull it down using |
It is less likely to cause merge conflicts and beginning with a line length of ~120 it should always be done to keep the lines readable on the GitHub web interface. Also please upstream patches beforehand because the developer can give important feedback which we can't know about. |
|
Fixing darwin build would additionally require diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index 512e0f12441..bbbdd34a9fc 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -27,6 +27,9 @@ mkDerivation rec {
postPatch = ''
substituteInPlace lib/src/install/installer.cpp --replace /usr "$out"
substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out"
+ for f in app/app.pro lib/lib.pro; do
+ substituteInPlace "$f" --replace "QMAKE_CXX = g++" ""
+ done
'';
qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ; |
|
nice one, thank you both ! will try to contact upstream and let's see how it goes :) |
|
the upstream did not respond - will apply suggestions here and reference the patch commit and let you know :) |
6178df9 to
9e8b07b
Compare
Removed references to QtWebKit and migrated to QtWebEngine. Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
9e8b07b to
a5f462e
Compare
|
@veprbl @SuperSandro2000 if you could review that would be grand |
4dd4286 to
48f22f4
Compare
|
awesome work, thank you ! |
Removed references to
QtWebKitand migrated toQtWebEngine. See #53079 for contextHit some minor snags where the compilation with
QtWebEnginedid not work out of the box, just a few missed references toQtWebFrame- fixed that with a patch. As a side note - I will talk to the developer to try to get the patches upstreamed.Motivation for this change
I've noticed that
mindforgerno longer installs from master because of build failures coming fromQtWebKit, took this opportunity to remove references to it as it's deprecated.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)