mindforger: remove use of deprecated QtWebFrame
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>
This commit is contained in:
parent
9affc60b0c
commit
a5f462e791
2 changed files with 22 additions and 5 deletions
|
@ -1,9 +1,10 @@
|
|||
{ mkDerivation
|
||||
, cmark-gfm
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtwebkit
|
||||
, qtwebengine
|
||||
, lib
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
@ -18,18 +19,34 @@ mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ qmake wrapGAppsHook ];
|
||||
buildInputs = [ qtbase qtwebkit cmark-gfm ] ;
|
||||
buildInputs = [ qtbase qtwebengine cmark-gfm ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
patches = [ ./build.patch ] ;
|
||||
patches = [
|
||||
# this makes the package relocatable - removes hardcoded references to /usr
|
||||
./paths.patch
|
||||
# this fixes compilation with QtWebEngine - referencing a commit trying to upstream the change - see https://github.com/dvorka/mindforger/pull/1357
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dvorka/mindforger/commit/d28e2bade0278af1b5249953202810540969026a.diff";
|
||||
sha256 = "sha256-qHKQQNGSc3F9seaOHV0gzBQFFqcTXk91LpKrojjpAUw=";
|
||||
})
|
||||
];
|
||||
|
||||
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" ] ;
|
||||
qmakeFlags = [
|
||||
"-r"
|
||||
"mindforger.pro"
|
||||
"CONFIG+=mfnoccache"
|
||||
"CONFIG+=mfwebengine"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Thinking Notebook & Markdown IDE";
|
||||
|
|
Loading…
Reference in a new issue