From 926b2f72014488216a0cb8a8d66ae0e0df24935a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 2 Jun 2022 17:52:06 +0200 Subject: toggldesktop: remove after being marked broken for over 18 months It was marked in commit e14a3598962dbe5d7eac89d8f4759807f1847aa1 by piegames on 2020-10-15 (commited on 2020-10-15) --- .../misc/toggldesktop/TogglDesktop.pro | 19 --- pkgs/applications/misc/toggldesktop/default.nix | 157 --------------------- pkgs/applications/misc/toggldesktop/libtoggl.pro | 20 --- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 198 deletions(-) delete mode 100644 pkgs/applications/misc/toggldesktop/TogglDesktop.pro delete mode 100644 pkgs/applications/misc/toggldesktop/default.nix delete mode 100644 pkgs/applications/misc/toggldesktop/libtoggl.pro diff --git a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro deleted file mode 100644 index e86156313d1f..000000000000 --- a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro +++ /dev/null @@ -1,19 +0,0 @@ -QT += core network widgets - -DEFINES += APP_ENVIRONMENT=\\\"production\\\" -DEFINES += APP_VERSION=\\\"@version@\\\" - -TARGET = toggldesktop -TEMPLATE = app - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -RESOURCES += *.qrc - -target.path = $$PREFIX - -INSTALLS += target - -CONFIG += link_pkgconfig -PKGCONFIG += bugsnag-qt qxtglobalshortcut qt-oauth-lib toggl x11 xscrnsaver diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix deleted file mode 100644 index 910f92a849e2..000000000000 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config -, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco -, qtbase, qtwebengine, qtx11extras, sqlite }: - -let - name = "toggldesktop-${version}"; - version = "7.4.231"; - - src = fetchFromGitHub { - owner = "toggl"; - repo = "toggldesktop"; - rev = "v${version}"; - sha256 = "sha256-YaeeUlwz42i1ik5nUKSIy0IBrvu1moi95dBK2lKfGAY="; - }; - - bugsnag-qt = mkDerivation rec { - pname = "bugsnag-qt"; - version = "20180522.005732"; - - src = fetchFromGitHub { - owner = "alpakido"; - repo = "bugsnag-qt"; - rev = version; - sha256 = "sha256-2L7pxdQOniwrp1Kgq3Q8BFbjb2yGtGoKUiQC+B6tRgs="; - }; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase ]; - }; - - qxtglobalshortcut = mkDerivation rec { - pname = "qxtglobalshortcut"; - version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; - - src = fetchFromGitHub { - owner = "hluk"; - repo = "qxtglobalshortcut"; - rev = version; - sha256 = "sha256-gb94rqK8j1mbD4YSXdOaxCdczZJFC6MU+iBsdf07wcc="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtx11extras ]; - }; - - qt-oauth-lib = mkDerivation rec { - pname = "qt-oauth-lib"; - version = "20190125.190943"; - - src = fetchFromGitHub { - owner = "alpakido"; - repo = "qt-oauth-lib"; - rev = version; - sha256 = "sha256-MjtNAN4F9JJFxM8MYpCv8tPe26RHtbXdq+lY49p+rn4="; - }; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebengine ]; - }; - - poco-pc = writeText "poco.pc" '' - Name: Poco - Description: ${poco.meta.description} - Version: ${poco.version} - Libs: -L${poco}/lib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation - Cflags: -I${poco}/include/Poco - ''; - - poco-pc-wrapped = runCommand "poco-pc-wrapped" {} '' - mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc - ''; - - libtoggl = mkDerivation { - name = "libtoggl-${version}"; - inherit src version; - - sourceRoot = "source/src"; - - nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; - - postPatch = '' - cat ${./libtoggl.pro} > libtoggl.pro - rm get_focused_window_{mac,windows}.cc - ''; - }; - - toggldesktop = mkDerivation { - name = "${name}-unwrapped"; - inherit src version; - - sourceRoot = "source/src/ui/linux/TogglDesktop"; - - postPatch = '' - substituteAll ${./TogglDesktop.pro} TogglDesktop.pro - substituteInPlace toggl.cpp \ - --replace ./../../../toggl_api.h toggl_api.h - ''; - - postInstall = '' - ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem - ''; - - nativeBuildInputs = [ qmake pkg-config ]; - - buildInputs = [ - bugsnag-qt - libtoggl - qxtglobalshortcut - qtbase - qtwebengine - qt-oauth-lib - qtx11extras - libX11 - libXScrnSaver - ]; - }; - - toggldesktop-icons = mkDerivation { - name = "${name}-icons"; - inherit (toggldesktop) src sourceRoot; - - installPhase = '' - for f in icons/*; do - mkdir -p $out/share/icons/hicolor/$(basename $f)/apps - mv $f/toggldesktop.png $_ - done - ''; - }; - - toggldesktop-wrapped = runCommand "toggldesktop-wrapped" {} '' - mkdir -p $out/bin && ln -s ${toggldesktop}/toggldesktop $_ - ''; - - desktopItem = makeDesktopItem rec { - categories = [ "Utility" ]; - desktopName = "Toggl"; - genericName = desktopName; - name = "toggldesktop"; - exec = "${toggldesktop-wrapped}/bin/toggldesktop"; - icon = "toggldesktop"; - }; -in - -buildEnv { - inherit name; - paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; - - meta = with lib; { - broken = true; # libtoggl is broken - description = "Client for Toggl time tracking service"; - homepage = "https://github.com/toggl/toggldesktop"; - license = licenses.bsd3; - maintainers = with maintainers; [ yana ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/toggldesktop/libtoggl.pro b/pkgs/applications/misc/toggldesktop/libtoggl.pro deleted file mode 100644 index c8303440fe67..000000000000 --- a/pkgs/applications/misc/toggldesktop/libtoggl.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = toggl -TEMPLATE = lib - -SOURCES += *.cc -HEADERS += *.h - -headers.files = $$HEADERS -headers.path = $$PREFIX/include -target.path = $$PREFIX/lib - -INSTALLS += headers target - -CONFIG += create_prl create_pc link_pkgconfig -PKGCONFIG += jsoncpp openssl lua poco sqlite3 x11 - -QMAKE_PKGCONFIG_NAME = $$TARGET -QMAKE_PKGCONFIG_PREFIX = $$PREFIX -QMAKE_PKGCONFIG_LIBDIR = $$target.path -QMAKE_PKGCONFIG_INCDIR = $$headers.path -QMAKE_PKGCONFIG_DESTDIR = pkgconfig diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84f52dbb4041..a3e46f9fa865 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30048,8 +30048,6 @@ with pkgs; todoman = callPackage ../applications/office/todoman { }; - toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { }; - topydo = callPackage ../applications/misc/topydo {}; torchat = callPackage ../applications/networking/instant-messengers/torchat { }; -- cgit v1.2.3