pyrox.dev
Merge pull request #106741 from cyplo/mindforger1.52
mindforger: 1.48.2 -> 1.52.0
+4
-53
pkgs/applications/editors/mindforger/build.patch
+4
-53
pkgs/applications/editors/mindforger/build.patch
···
1
1
diff --git a/app/app.pro b/app/app.pro
2
-
index 4d47065..a39a320 100644
2
+
index 29f9d9e..15fd2ff 100644
3
3
--- a/app/app.pro
4
4
+++ 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 += \
15
6
# See http://doc.qt.io/qt-5/qmake-advanced-usage.html
16
7
17
8
binfile.files += mindforger
···
20
11
INSTALLS += binfile
21
12
22
13
# ########################################
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
-
}
54
14
diff --git a/mindforger.pro b/mindforger.pro
55
-
index ae627f2..0953856 100644
15
+
index bd4f21d..6bb2dbc 100644
56
16
--- a/mindforger.pro
57
17
+++ 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
68
19
#IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary)
69
20
70
21
docfiles.files += doc/*
+16
-16
pkgs/applications/editors/mindforger/default.nix
+16
-16
pkgs/applications/editors/mindforger/default.nix
···
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
+
}:
2
10
3
11
mkDerivation rec {
4
12
pname = "mindforger";
5
-
version = "1.48.2";
13
+
version = "1.52.0";
6
14
7
15
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";
10
18
};
11
19
12
-
nativeBuildInputs = [ qmake ] ;
13
-
buildInputs = [ qtbase qtwebkit ] ;
20
+
nativeBuildInputs = [ qmake wrapGAppsHook ] ;
21
+
buildInputs = [ qtbase qtwebkit cmark-gfm ] ;
14
22
15
23
doCheck = true;
16
24
17
-
enableParallelBuilding = true ;
18
-
19
25
patches = [ ./build.patch ] ;
20
26
21
27
postPatch = ''
22
-
substituteInPlace deps/discount/version.c.in --subst-var-by TABSTOP 4
28
+
substituteInPlace lib/src/install/installer.cpp --replace /usr "$out"
23
29
substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out"
24
30
'';
25
31
26
-
preConfigure = ''
27
-
export AC_PATH="$PATH"
28
-
pushd deps/discount
29
-
./configure.sh
30
-
popd
31
-
'';
32
-
33
32
qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ;
34
33
35
34
meta = with stdenv.lib; {
···
41
40
homepage = "https://www.mindforger.com";
42
41
license = licenses.gpl2Plus;
43
42
platforms = platforms.all;
43
+
maintainers = with maintainers; [ cyplo ];
44
44
};
45
45
}