git.iko.soy/typeable/nixpkgs
on master help sign in
mindforger: 1.48.2 -> 1.52.0
commit31f845840c2baf8aa56f602fae518b640a9bd220 authorCyryl Płotnicki <cyplo@cyplo.net> dateSat 12 Dec 2020, 12:44 (6 years ago) parent58f3c19
2 files changed+20−69
pkgs/applications/editors/mindforger/build.patch+4−53 pkgs/applications/editors/mindforger/default.nix+16−16
pkgs/applications/editors/mindforger/build.patch+4−53
@@ -1,17 +1,8 @@
11diff --git a/app/app.pro b/app/app.pro
2−index 4d47065..a39a320 100644
2+index 29f9d9e..15fd2ff 100644
33--- a/app/app.pro
44+++ b/app/app.pro
5−@@ -18,6 +18,8 @@
6− TARGET = mindforger
7− TEMPLATE = app
8−
9−+include(../config.pri)
10−+
11− QT += widgets
12−
13− mfner {
14−@@ -297,7 +299,7 @@ RESOURCES += \
5+@@ -370,7 +370,7 @@ RESOURCES += \
156 # See http://doc.qt.io/qt-5/qmake-advanced-usage.html
167
178 binfile.files += mindforger
@@ -20,51 +11,11 @@ index 4d47065..a39a320 100644
2011 INSTALLS += binfile
2112
2213 # ########################################
23−diff --git a/config.pri b/config.pri
24−new file mode 100644
25−index 0000000..ce05df1
26−--- /dev/null
27−+++ b/config.pri
28−@@ -0,0 +1,3 @@
29−+isEmpty(PREFIX) {
30−+ PREFIX = /usr
31−+}
32−diff --git a/deps/discount/discount.pro b/deps/discount/discount.pro
33−index a8dfe35..ec16468 100644
34−--- a/deps/discount/discount.pro
35−+++ b/deps/discount/discount.pro
36−@@ -5,6 +5,8 @@
37− # Webpage: http://www.pell.portland.or.us/~orc/Code/discount/
38− #
39−
40−+include(../../config.pri)
41−+
42− QT -= core gui
43−
44− TARGET = discount
45−@@ -46,7 +48,7 @@ unix:!symbian {
46− maemo5 {
47− target.path = /opt/usr/lib
48− } else {
49−- target.path = /usr/lib
50−+ target.path = $$PREFIX/lib
51− }
52− INSTALLS += target
53− }
5414diff --git a/mindforger.pro b/mindforger.pro
55−index ae627f2..0953856 100644
15+index bd4f21d..6bb2dbc 100644
5616--- a/mindforger.pro
5717+++ b/mindforger.pro
58−@@ -32,6 +32,8 @@ TEMPLATE = subdirs
59−
60− SUBDIRS = deps lib app
61−
62−+include(config.pri)
63−+
64− # build dependencies
65− lib.depends = deps
66− app.depends = lib
67−@@ -44,20 +46,20 @@ app.depends = lib
18+@@ -43,20 +43,20 @@ app.depends = lib
6819 #IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary)
6920
7021 docfiles.files += doc/*
pkgs/applications/editors/mindforger/default.nix+16−16
@@ -1,35 +1,34 @@
1−{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }:
1+{ mkDerivation
2+, cmark-gfm
3+, fetchurl
4+, qmake
5+, qtbase
6+, qtwebkit
7+, stdenv
8+, wrapGAppsHook
9+}:
210
311mkDerivation rec {
412 pname = "mindforger";
5− version = "1.48.2";
13+ version = "1.52.0";
614
715 src = fetchurl {
8− url = "https://github.com/dvorka/mindforger/releases/download/1.48.0/mindforger_${version}.tgz";
9− sha256 = "1wlrl8hpjcpnq098l3n2d1gbhbjylaj4z366zvssqvmafr72iyw4";
16+ url = "https://github.com/dvorka/mindforger/releases/download/${version}/mindforger_${version}.tgz";
17+ sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd";
1018 };
1119
12− nativeBuildInputs = [ qmake ] ;
13− buildInputs = [ qtbase qtwebkit ] ;
20+ nativeBuildInputs = [ qmake wrapGAppsHook ] ;
21+ buildInputs = [ qtbase qtwebkit cmark-gfm ] ;
1422
1523 doCheck = true;
1624
17− enableParallelBuilding = true ;
18−
1925 patches = [ ./build.patch ] ;
2026
2127 postPatch = ''
22− substituteInPlace deps/discount/version.c.in --subst-var-by TABSTOP 4
28+ substituteInPlace lib/src/install/installer.cpp --replace /usr "$out"
2329 substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out"
2430 '';
2531
26− preConfigure = ''
27− export AC_PATH="$PATH"
28− pushd deps/discount
29− ./configure.sh
30− popd
31− '';
32−
3332 qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ;
3433
3534 meta = with stdenv.lib; {
@@ -41,5 +40,6 @@ mkDerivation rec {
4140 homepage = "https://www.mindforger.com";
4241 license = licenses.gpl2Plus;
4342 platforms = platforms.all;
43+ maintainers = with maintainers; [ cyplo ];
4444 };
4545}