diff --git a/pkgs/by-name/to/todoist-electron/package.nix b/pkgs/by-name/to/todoist-electron/package.nix index 5c00493166f8..69a4cbd07fbf 100644 --- a/pkgs/by-name/to/todoist-electron/package.nix +++ b/pkgs/by-name/to/todoist-electron/package.nix @@ -4,26 +4,26 @@ fetchurl, asar, }: + let pname = "todoist-electron"; - version = "9.8.0"; + version = "9.18.0"; src = fetchurl { - url = "https://electron-dl.todoist.com/linux/Todoist-linux-${version}-x86_64-latest.AppImage"; - hash = "sha256-ZuoeeQ7SusRhr5BXBYEWCZ9pjdcWClKoR0mnom1XkPg="; + url = "https://electron-dl.todoist.net/linux/Todoist-linux-${version}-x86_64-latest.AppImage"; + hash = "sha256-2X//beSpQ1rCqU4Wn5ELoxgfi2knFAJ2w1rn41TNP6g="; }; - appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { - buildCommand = '' - ${oA.buildCommand} + appimageContents = appimageTools.extract { + inherit pname version src; - # Get rid of the autoupdater - ${asar}/bin/asar extract $out/resources/app.asar app + # Get rid of the autoupdater + postExtract = '' + ${lib.getExe asar} extract $out/resources/app.asar app sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js - ${asar}/bin/asar pack app $out/resources/app.asar + ${lib.getExe asar} pack app $out/resources/app.asar ''; - }); - + }; in appimageTools.wrapAppImage { inherit pname version; @@ -31,23 +31,24 @@ appimageTools.wrapAppImage { extraPkgs = pkgs: [ pkgs.hidapi ]; + # Add desktop convencience stuff extraInstallCommands = '' - # Add desktop convencience stuff - install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps + install -D --mode 0644 ${appimageContents}/todoist.desktop -t $out/share/applications + install -D --mode 0644 ${appimageContents}/todoist.png -t $out/share/pixmaps substituteInPlace $out/share/applications/todoist.desktop \ - --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --" + --replace-fail "Exec=AppRun" "Exec=todoist-electron --" \ + --replace-fail "Exec=todoist" "Exec=todoist-electron --" ''; - meta = with lib; { - homepage = "https://todoist.com"; - description = "Official Todoist electron app"; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - maintainers = with maintainers; [ + meta = { + description = "To-Do List App & Task Manager"; + homepage = "https://www.todoist.com"; + license = lib.licenses.unfree; + mainProgram = "todoist-electron"; + maintainers = with lib.maintainers; [ kylesferrazza pokon548 ]; - mainProgram = "todoist-electron"; + platforms = [ "x86_64-linux" ]; }; }