@@ -2,40 +2,42 @@
22, stdenv
33, fetchFromGitHub
44, nix-update-script
5−, pantheon
5+, desktop-file-utils
6+, meson
7+, ninja
68, pkg-config
9+, python3
710, vala
8−, cmake
9−, ninja
11+, wrapGAppsHook
12+, discount
13+, glib
1014, gtk3
11−, gtksourceview3
12−, webkitgtk
15+, gtksourceview4
1316, gtkspell3
14−, glib
1517, libgee
16−, pcre
18+, pantheon
1719, sqlite
18−, discount
19−, wrapGAppsHook
20−, withPantheon ? false
20+, webkitgtk
2121}:
2222
2323stdenv.mkDerivation rec {
2424 pname = "notes-up";
25− version = "unstable-2020-12-29";
25+ version = "2.0.6";
2626
2727 src = fetchFromGitHub {
2828 owner = "Philip-Scott";
2929 repo = "Notes-up";
30− rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f";
31− sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk=";
30+ rev = version;
31+ sha256 = "sha256-t9BCtdWd2JLrKTcmri1Lgl5RLBYD2xWCtMxoVXz0XPk=";
3232 };
3333
3434 nativeBuildInputs = [
35− cmake
35+ desktop-file-utils
36+ meson
3637 ninja
37− vala
3838 pkg-config
39+ python3
40+ vala
3941 wrapGAppsHook
4042 ];
4143
@@ -43,17 +45,18 @@ stdenv.mkDerivation rec {
4345 discount
4446 glib
4547 gtk3
46− gtksourceview3
48+ gtksourceview4
4749 gtkspell3
4850 libgee
4951 pantheon.granite
50− pcre
5152 sqlite
5253 webkitgtk
5354 ];
5455
55− # Whether to build with contractor support (Pantheon specific)
56− cmakeFlags = lib.optional (!withPantheon) "-Dnoele=yes";
56+ postPatch = ''
57+ chmod +x meson/post_install.py
58+ patchShebangs meson/post_install.py
59+ '';
5760
5861 passthru = {
5962 updateScript = nix-update-script {
@@ -62,12 +65,11 @@ stdenv.mkDerivation rec {
6265 };
6366
6467 meta = with lib; {
65− description = "Markdown notes editor and manager designed for elementary OS"
66− + lib.optionalString withPantheon " - built with Contractor support";
68+ description = "Markdown notes editor and manager designed for elementary OS";
6769 homepage = "https://github.com/Philip-Scott/Notes-up";
6870 license = licenses.gpl2Only;
6971 maintainers = with maintainers; [ ] ++ teams.pantheon.members;
7072 platforms = platforms.linux;
71− mainProgram = "com.github.philip-scott.notes-up";
73+ mainProgram = "com.github.philip_scott.notes-up";
7274 };
7375}