Merge pull request #122476 from cyplo/migrate-mindforger-to-webengine

mindforger: remove use of deprecated QtWebKit
This commit is contained in:
Dmitry Kalinkin 2021-06-12 11:29:36 -04:00 committed by GitHub
commit 0c6186fc78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 8 deletions

View file

@ -1,14 +1,16 @@
{ mkDerivation
{ lib
, stdenv
, cmark-gfm
, fetchurl
, fetchpatch
, qmake
, qtbase
, qtwebkit
, lib
, qtwebengine
, wrapGAppsHook
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "mindforger";
version = "1.52.0";
@ -17,19 +19,41 @@ mkDerivation rec {
sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd";
};
nativeBuildInputs = [ qmake wrapGAppsHook ] ;
buildInputs = [ qtbase qtwebkit cmark-gfm ] ;
nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ];
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"
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir "$out"/Applications
mv app/mindforger.app "$out"/Applications/
wrapQtApp "$out"/Applications/mindforger.app/Contents/MacOS/mindforger
'';
meta = with lib; {
description = "Thinking Notebook & Markdown IDE";