From 518d63c08da1a3c0d42098b4a2cbd243007646cf Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 16 Sep 2023 09:23:08 +0000 Subject: [PATCH] tokodon: remove this is upstream now; my own build file was already a no-op --- pkgs/additional/tokodon/default.nix | 70 ----------------------------- pkgs/default.nix | 1 - 2 files changed, 71 deletions(-) delete mode 100644 pkgs/additional/tokodon/default.nix diff --git a/pkgs/additional/tokodon/default.nix b/pkgs/additional/tokodon/default.nix deleted file mode 100644 index 4443b2b9..00000000 --- a/pkgs/additional/tokodon/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, extra-cmake-modules -, kconfig -, kdbusaddons -, ki18n -, kirigami2 -, kitemmodels -, knotifications -, libwebsockets -, pimcommon -, pkg-config -, qqc2-desktop-style -, qtbase -, qtkeychain -, qtmultimedia -, qtquickcontrols2 -, qttools -, qtwebsockets -, wrapQtAppsHook -}: - -stdenv.mkDerivation rec { - pname = "tokodon"; - version = "22.09"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = pname; - # rev = "f919a7ae62dec665646d2ff3ca02e2e256b7a8a9"; - # sha256 = "sha256-HVDM93nJTs7uTWs1n0t7UUtXQW6jFfoImaDxbTmlc0A="; - rev = "v${version}"; - sha256 = "sha256-wHE8HPnjXd+5UG5WEMd7+m1hu2G3XHq/eVQNznvS/zc="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - kconfig - kdbusaddons - ki18n - kirigami2 - kitemmodels - knotifications - pimcommon - qqc2-desktop-style - qtbase - qtkeychain - qtmultimedia - qtquickcontrols2 - qttools - qtwebsockets - ]; - - meta = with lib; { - description = "A Mastodon client for Plasma and Plasma Mobile"; - homepage = src.meta.homepage; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer ]; - }; -} - diff --git a/pkgs/default.nix b/pkgs/default.nix index 4f9909db..7c0a479d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -72,7 +72,6 @@ let # fluffychat-moby = callPackage ./additional/fluffychat-moby { }; fractal-latest = callPackage ./additional/fractal-latest { }; # kaiteki = callPackage ./additional/kaiteki { }; - # tokodon = libsForQt5.callPackage ./additional/tokodon { }; # old rpi packages that may or may not still work # bootpart-tow-boot-rpi-aarch64 = callPackage ./additional/bootpart-tow-boot-rpi-aarch64 { };