From 6ed27fb306a2981bcfa1d06ff16979ab3ba7755f Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 23 Oct 2025 12:46:49 +0800 Subject: [PATCH] packages.dida: drop --- modules/packages/desktop.nix | 2 +- packages/default.nix | 1 - packages/dida.nix | 38 ------------------------------------ 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 packages/dida.nix diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 9979aaee..6fd4c4f6 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -68,7 +68,7 @@ inputs: # for kdenlive auto subtitle openai-whisper # daily management - activitywatch localPackages.dida + activitywatch ] ++ (builtins.filter (p: !((p.meta.broken or false) || (builtins.elem p.pname or null [ "falkon" "kalzium" ]))) (builtins.filter inputs.lib.isDerivation (builtins.attrValues kdePackages.kdeGear))); diff --git a/packages/default.nix b/packages/default.nix index 6c3c4cff..17f3eccc 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -144,7 +144,6 @@ inputs: rec buildProxy = inputs.pkgs.lib.mkBuildproxy ./pybinding/proxy.nix; }; brokenaxes = inputs.pkgs.python3Packages.callPackage ./brokenaxes.nix { src = inputs.topInputs.brokenaxes; }; - dida = inputs.pkgs.callPackage ./dida.nix {}; fromYaml = content: builtins.fromJSON (builtins.readFile (inputs.pkgs.runCommand "toJSON" {} diff --git a/packages/dida.nix b/packages/dida.nix deleted file mode 100644 index faac17e8..00000000 --- a/packages/dida.nix +++ /dev/null @@ -1,38 +0,0 @@ -# port from nixpkgs ad10336d56fcc811dc4bc5af2f8f2d0b71a407d0 -{ - fetchurl, stdenv, - wrapGAppsHook3, dpkg, autoPatchelfHook, glibc, gcc-unwrapped, nss, libdrm, libgbm, alsa-lib, xdg-utils, systemd -}: stdenv.mkDerivation rec -{ - pname = "dida"; - version = "6.0.40"; - src = fetchurl - { - url = "https://cdn.dida365.cn/download/linux/linux_deb_x64/dida-${version}-amd64.deb"; - sha256 = "08wy9blzkhkn2fl8sv2prv7bzp77skg5m32jzvz3sy4j8x2nanmi"; - }; - nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook dpkg ]; - buildInputs = [ nss glibc libdrm gcc-unwrapped libgbm alsa-lib xdg-utils ]; - runtimeDependencies = [ systemd ]; - unpackPhase = - '' - runHook preUnpack - mkdir -p "$out/share" "$out/opt/dida" "$out/bin" - dpkg-deb --fsys-tarfile "$src" | tar --extract --directory="$out" - runHook postUnpack - ''; - installPhase = '' - runHook preInstall - mv $out/usr/share $out - rm -r $out/usr - ln -sf "$out/opt/dida/dida" "$out/bin/dida" - substituteInPlace "$out/share/applications/dida.desktop" --replace "Exec=/opt/dida/dida" "Exec=$out/bin/dida" - runHook postInstall - ''; - preFixup = - '' - gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - ) - ''; -}