diff options
| -rw-r--r-- | pkgs/applications/office/notes-up/default.nix | 46 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/default.nix | 4 |
2 files changed, 26 insertions, 24 deletions
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 1aa6f7f78e937..2f1bcab0649da 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -2,40 +2,42 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon +, desktop-file-utils +, meson +, ninja , pkg-config +, python3 , vala -, cmake -, ninja +, wrapGAppsHook +, discount +, glib , gtk3 -, gtksourceview3 -, webkitgtk +, gtksourceview4 , gtkspell3 -, glib , libgee -, pcre +, pantheon , sqlite -, discount -, wrapGAppsHook -, withPantheon ? false +, webkitgtk }: stdenv.mkDerivation rec { pname = "notes-up"; - version = "unstable-2020-12-29"; + version = "2.0.6"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Notes-up"; - rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f"; - sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk="; + rev = version; + sha256 = "sha256-t9BCtdWd2JLrKTcmri1Lgl5RLBYD2xWCtMxoVXz0XPk="; }; nativeBuildInputs = [ - cmake + desktop-file-utils + meson ninja - vala pkg-config + python3 + vala wrapGAppsHook ]; @@ -43,17 +45,18 @@ stdenv.mkDerivation rec { discount glib gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libgee pantheon.granite - pcre sqlite webkitgtk ]; - # Whether to build with contractor support (Pantheon specific) - cmakeFlags = lib.optional (!withPantheon) "-Dnoele=yes"; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; passthru = { updateScript = nix-update-script { @@ -62,12 +65,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Markdown notes editor and manager designed for elementary OS" - + lib.optionalString withPantheon " - built with Contractor support"; + description = "Markdown notes editor and manager designed for elementary OS"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2Only; maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; - mainProgram = "com.github.philip-scott.notes-up"; + mainProgram = "com.github.philip_scott.notes-up"; }; } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 3300dd2ec8c4c..3e49d6823477d 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -33,8 +33,6 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; - notes-up = pkgs.notes-up.override { withPantheon = true; }; - touchegg = pkgs.touchegg.override { withPantheon = true; }; #### APPS @@ -223,4 +221,6 @@ lib.makeScope pkgs.newScope (self: with self; { extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 + inherit (pkgs) notes-up; # added 2021-12-18 + }) |