From 173bf39cc28caffc034bba1800bcdb709ce90a98 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Tue, 6 Oct 2020 15:41:30 -0400
Subject: [PATCH 1/3] todoist-electron: 1.23.0 -> 1.24.0

---
 pkgs/applications/misc/todoist-electron/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index e1d578edb0f5..6c361e7dca49 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "todoist-electron";
-  version = "1.23.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb";
-    sha256 = "1yxa0fdc3fnffny6jf1hm7545792pw7828mc27il17l4kn346g98";
+    sha256 = "0g35518z6nf6pnfyx4ax75rq8b8br72mi6wv6jzgac9ric1q4h2s";
   };
 
   desktopItem = makeDesktopItem {

From 59455622b6543c66eed12f372d7cba43c1d79ca6 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Tue, 6 Oct 2020 17:06:27 -0400
Subject: [PATCH 2/3] todoist-electron: Switch to MIT license

---
 pkgs/applications/misc/todoist-electron/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index 6c361e7dca49..463aeac9349a 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/KryDos/todoist-linux";
     description = "The Linux wrapper for Todoist web version";
     platforms = [ "x86_64-linux" ];
-    license = licenses.isc;
+    license = licenses.mit;
     maintainers = with maintainers; [ i077 ];
   };
 }

From 8cfeba2bbca84010ef9fa20800efe25d7024a708 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Tue, 20 Oct 2020 17:22:41 -0400
Subject: [PATCH 3/3] todoist-electron: Use desktop icon

---
 pkgs/applications/misc/todoist-electron/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index 463aeac9349a..9e70bf881625 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
 
   desktopItem = makeDesktopItem {
     name = "Todoist";
-    exec = "todoist";
+    exec = "todoist %U";
+    icon = "todoist";
+    comment = "Todoist for Linux";
     desktopName = "Todoist";
     categories = "Utility";
   };
@@ -35,6 +37,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p "$out/bin"
     mv opt "$out/"
+    mv usr/share "$out/share"
 
     # Patch binary
     patchelf \
@@ -48,7 +51,8 @@ stdenv.mkDerivation rec {
 
     # Desktop item
     mkdir -p "$out/share"
-    ln -s "${desktopItem}/share/applications" "$out/share/applications"
+    rm -r "$out/share/applications"
+    cp -r "${desktopItem}/share/applications" "$out/share/applications"
   '';
 
   meta = with lib; {