qsyncthingtray: remove (#484956)
This commit is contained in:
@@ -1,96 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
procps,
|
||||
qtbase,
|
||||
qtwebengine,
|
||||
qtwebkit,
|
||||
syncthing,
|
||||
preferQWebView ? false,
|
||||
preferNative ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.8";
|
||||
pname = "qsyncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sieren";
|
||||
repo = "QSyncthingTray";
|
||||
rev = version;
|
||||
sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtwebengine
|
||||
]
|
||||
++ lib.optional preferQWebView qtwebkit;
|
||||
|
||||
cmakeFlags =
|
||||
[ ]
|
||||
++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"
|
||||
++ lib.optional preferNative "-DQST_BUILD_NATIVEBROWSER=1";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "support_native_browser.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch";
|
||||
sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy";
|
||||
})
|
||||
]
|
||||
++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch;
|
||||
|
||||
postPatch = ''
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace includes/platforms/linux/posixUtils.hpp \
|
||||
--replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \
|
||||
--replace '"pgrep -x' '"${procps}/bin/pgrep -x'
|
||||
''}
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace includes/platforms/darwin/macUtils.hpp \
|
||||
--replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"'
|
||||
''}
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
let
|
||||
qst = "qsyncthingtray";
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
install -m755 QSyncthingTray $out/bin/${qst}
|
||||
ln -s $out/bin/${qst} $out/bin/QSyncthingTray
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/sieren/QSyncthingTray/";
|
||||
description = "Traybar Application for Syncthing written in C++";
|
||||
longDescription = ''
|
||||
A cross-platform status bar for Syncthing.
|
||||
Currently supports macOS, Windows and Linux.
|
||||
Written in C++ with Qt.
|
||||
'';
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
zraexy
|
||||
peterhoeg
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
broken = !preferNative || stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b778d09..247b606 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -12,7 +12,7 @@ set(CMAKE_AUTOMOC ON)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
|
||||
-find_package(Qt5 5.6 COMPONENTS Widgets Network PrintSupport)
|
||||
+find_package(Qt5 5.6 COMPONENTS Widgets Network PrintSupport WebEngineWidgets)
|
||||
if (NOT Qt5_FOUND)
|
||||
message(FATAL_ERROR
|
||||
"Some components of Qt5 not found (see above messages for details. "
|
||||
@@ -1522,6 +1522,7 @@ mapAliases {
|
||||
qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19
|
||||
qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27
|
||||
qscintilla-qt6 = throw "'qscintilla-qt6' has been renamed to/replaced by 'qt6Packages.qscintilla'"; # Converted to throw 2025-10-27
|
||||
qsyncthingtray = throw "'qsyncthingtray' has been removed as it was unmaintained. Switch to 'syncthingtray' or 'syncthingtray-minimal'"; # Added 2026-01-29
|
||||
qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18
|
||||
qt6ct = throw "'qt6ct' has been renamed to/replaced by 'qt6Packages.qt6ct'"; # Converted to throw 2025-10-27
|
||||
qt515 = throw "'qt515' has been renamed to/replaced by 'qt5'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -11076,8 +11076,6 @@ with pkgs;
|
||||
|
||||
qsstv = qt5.callPackage ../applications/radio/qsstv { };
|
||||
|
||||
qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
|
||||
|
||||
qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
|
||||
|
||||
qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
|
||||
|
||||
Reference in New Issue
Block a user