From 984d7a10d19c89bae91a2fc32cff2f0b4f656bed Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 4 Jun 2023 11:31:52 +0800 Subject: [PATCH] thiefmd: 0.2.5 -> 0.2.7 --- pkgs/applications/editors/thiefmd/default.nix | 69 ++++++++++++------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix index 7f265aefcd0..1b7b4a668b2 100644 --- a/pkgs/applications/editors/thiefmd/default.nix +++ b/pkgs/applications/editors/thiefmd/default.nix @@ -1,46 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, cmake, desktop-file-utils, glib -, meson, ninja, pkg-config, vala, clutter, discount, gtk3, gtksourceview4, gtkspell3 -, libarchive, libgee, libhandy, libsecret, link-grammar, webkitgtk }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, vala +, pkg-config +, wrapGAppsHook +, desktop-file-utils +, discount +, glib +, gtk3 +, gtksourceview4 +, gtkspell3 +, json-glib +, libarchive +, libgee +, libhandy +, libsecret +, libxml2 +, link-grammar +, webkitgtk_4_1 +}: stdenv.mkDerivation rec { pname = "thiefmd"; - version = "0.2.5-stability"; + version = "0.2.7"; src = fetchFromGitHub { owner = "kmwallio"; repo = "ThiefMD"; rev = "v${version}"; - sha256 = "sha256-cUZ7NVGe4e9ZISo9gjWFuDNCyF3rsQtrDX+ureyqtwM="; + hash = "sha256-noNfGFMeIyKhAgiovJDn91TLELAOQ4nD/5QlQfsKTII="; fetchSubmodules = true; }; nativeBuildInputs = [ - cmake desktop-file-utils glib meson wrapGAppsHook - ninja pkg-config vala + meson + ninja + vala + pkg-config + wrapGAppsHook + desktop-file-utils ]; buildInputs = [ - clutter discount gtk3 gtksourceview4 gtkspell3 - libarchive libgee libhandy libsecret link-grammar - webkitgtk + discount # libmarkdown + glib + gtk3 + gtksourceview4 + gtkspell3 + json-glib + libarchive + libgee + libhandy + libsecret + libxml2 + link-grammar + webkitgtk_4_1 ]; - dontUseCmakeConfigure = true; - - postInstall = '' - mv $out/share/applications/com.github.kmwallio.thiefmd.desktop \ - $out/share/applications/thiefmd.desktop - substituteInPlace $out/share/applications/thiefmd.desktop \ - --replace 'Exec=com.github.kmwallio.' Exec=$out/bin/ - - makeWrapper $out/bin/com.github.kmwallio.thiefmd \ - $out/bin/thiefmd \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" - ''; - meta = with lib; { description = "Markdown & Fountain editor that helps with organization and management"; homepage = "https://thiefmd.com"; + downloadPage = "https://github.com/kmwallio/ThiefMD"; + mainProgram = "com.github.kmwallio.thiefmd"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ wolfangaukang ];