push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,43 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31e8048..b21f6f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,12 +5,7 @@ set(CMAKE_CXX_STANDARD 17)
find_package(PkgConfig)
include(FetchContent)
-FetchContent_Declare(
- spdlog
- GIT_REPOSITORY https://github.com/gabime/spdlog.git
- GIT_TAG v1.10.0
-)
-FetchContent_MakeAvailable(spdlog)
+find_package(spdlog REQUIRED)
pkg_check_modules(GTKMM REQUIRED gtkmm-3.0)
find_package(X11 REQUIRED)
@@ -19,4 +14,10 @@ link_directories(${GTKMM_LIBRARY_DIRS})
include_directories(${GTKMM_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
add_executable(WSysMon src/main.cpp src/ui/MainWindow.cpp src/ui/widgets/GraphWidget.cpp src/ui/widgets/PerformanceButton.cpp src/ui/views/ProcessesView.cpp src/ui/views/PerformanceView.cpp src/ui/views/performance/PerformanceCPUView.cpp src/ui/views/performance/PerformanceGPUView.cpp src/ui/views/performance/PerformanceNetworkView.cpp src/ui/views/performance/PerformanceRAMView.cpp src/utils/DispatcherThread.cpp src/utils/UnitConverter.cpp src/utils/X11Utils.cpp src/api/process/ProcessManager.cpp src/api/process/ProcessNode.cpp src/api/linux/ProcessesApi.cpp src/api/linux/GPUApi.cpp src/api/linux/NetworkApi.cpp src/api/linux/SystemInfoApi.cpp src/api/DiskApi.h src/api/linux/DiskApi.cpp src/ui/views/performance/PerformanceDiskView.cpp src/ui/views/performance/PerformanceDiskView.h src/api/linux/gpu/nvml.h src/api/linux/gpu/nvml_hook_funcs.inl src/api/linux/gpu/NvGpuApi.cpp src/api/linux/gpu/NvGpuApi.h src/api/HwMonApi.h src/api/linux/HwMonApi.cpp)
-target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread procps ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES})
+target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES})
+
+install(
+ TARGETS
+ WSysMon
+ RUNTIME DESTINATION bin
+)
diff --git a/src/api/process/ProcessManager.h b/src/api/process/ProcessManager.h
index 44989f4..2e98963 100644
--- a/src/api/process/ProcessManager.h
+++ b/src/api/process/ProcessManager.h
@@ -5,8 +5,6 @@
#include <map>
#include <vector>
-#include <proc/readproc.h>
-
#include "ProcessNode.h"
#include "../ProcessesApi.h"

View File

@@ -0,0 +1,50 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
gtkmm3,
gtk3,
spdlog,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wsysmon";
version = "0.1.0";
src = fetchFromGitHub {
owner = "slyfabi";
repo = "wsysmon";
tag = finalAttrs.version;
hash = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A=";
};
patches = [
# - Dynamically link spdlog
# - Remove dependency on procps (had a newer version than this package expected)
# - See https://github.com/SlyFabi/WSysMon/issues/4 for the issue about procps and why it could be removed
# - Add an installPhase
./fix-deps-and-add-install.patch
];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
gtkmm3
gtk3
spdlog
];
meta = {
description = "Windows task manager clone for Linux";
homepage = "https://github.com/SlyFabi/WSysMon";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ totoroot ];
mainProgram = "WSysMon";
};
})