From edf15b210c9731c7538e516e0b460e75c8252833 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Mon, 26 Feb 2024 12:59:49 -0600 Subject: [PATCH] fix: Use unstable ticktick --- hosts/framework/default.nix | 2 +- hosts/meshify/default.nix | 2 +- packages/ticktick.nix | 81 ------------------------------------- 3 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 packages/ticktick.nix diff --git a/hosts/framework/default.nix b/hosts/framework/default.nix index b15057e5..34873bbf 100644 --- a/hosts/framework/default.nix +++ b/hosts/framework/default.nix @@ -110,7 +110,7 @@ tauon unstable.thunderbird my.catgpt - my.ticktick + unstable.ticktick ]; # Mount iPhone diff --git a/hosts/meshify/default.nix b/hosts/meshify/default.nix index 1bb9e9f1..f2a85483 100644 --- a/hosts/meshify/default.nix +++ b/hosts/meshify/default.nix @@ -104,7 +104,7 @@ name = "ticktick"; desktopName = "TickTick"; icon = "ticktick"; - exec = "${my.ticktick}/bin/ticktick --disable-gpu"; + exec = "${unstable.ticktick}/bin/ticktick --disable-gpu"; # categories = ["Development"]; }) ]; diff --git a/packages/ticktick.nix b/packages/ticktick.nix deleted file mode 100644 index b4f616c2..00000000 --- a/packages/ticktick.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - fetchurl, - stdenv, - wrapGAppsHook, - dpkg, - autoPatchelfHook, - glibc, - gcc-unwrapped, - nss, - libdrm, - mesa, - alsa-lib, - xdg-utils, - systemd, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "ticktick"; - version = "2.0.0"; - - src = fetchurl { - url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-LOllYdte+Y+pbjXI2zOQrwptmUo4Ck6OyYoEX6suY08="; - }; - - nativeBuildInputs = [ - wrapGAppsHook - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - nss - glibc - libdrm - gcc-unwrapped - mesa - alsa-lib - xdg-utils - ]; - - # Needed to make the process get past zygote_linux fork()'ing - runtimeDependencies = [ - systemd - ]; - - unpackPhase = '' - runHook preUnpack - - mkdir -p "$out/share" "$out/opt/${finalAttrs.pname}" "$out/bin" - dpkg-deb --fsys-tarfile "$src" | tar --extract --directory="$out" - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - cp -av $out/opt/TickTick/* $out/opt/${finalAttrs.pname} - cp -av $out/usr/share/* $out/share - rm -rf $out/usr $out/opt/TickTick - ln -sf "$out/opt/${finalAttrs.pname}/${finalAttrs.pname}" "$out/bin/${finalAttrs.pname}" - - substituteInPlace "$out/share/applications/${finalAttrs.pname}.desktop" \ - --replace "Exec=/opt/TickTick/ticktick" "Exec=$out/bin/${finalAttrs.pname}" - - wrapProgram $out/bin/${finalAttrs.pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=wayland --enable-features=WaylandWindowDecorations}} --no-update" - - runHook postInstall - ''; - - meta = with lib; { - description = "A powerful to-do & task management app with seamless cloud synchronization across all your devices"; - homepage = "https://ticktick.com/home/"; - license = licenses.unfree; - maintainers = with maintainers; [hbjydev]; - platforms = ["x86_64-linux"]; - sourceProvenance = with sourceTypes; [binaryNativeCode]; - }; -})