From b7e426edb87561029038a56100effe138cb284f7 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 6 Apr 2023 06:32:44 -0500 Subject: [PATCH] tweaks to build env --- CMakeLists.txt | 4 ++-- default.nix | 8 +------- shell.nix | 10 +++++----- src/main.cpp | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19901bc..530e1cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ include(ECMPoQmTools) kde_enable_exceptions() find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui QuickControls2 Widgets Sql X11Extras QmlImportScanner) -find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 WindowSystem I18n Archive CoreAddons) +find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 CoreAddons I18n Archive) # find_package(PkgConfig REQUIRED) # pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET @@ -128,7 +128,7 @@ target_link_libraries(${CRATE} INTERFACE KF5::I18n KF5::Archive KF5::CoreAddons - KF5::WindowSystem + # KF5::WindowSystem # podofo mpv ) diff --git a/default.nix b/default.nix index 2db6c04..fba539a 100644 --- a/default.nix +++ b/default.nix @@ -22,13 +22,7 @@ kirigami2, ki18n, kcoreaddons, - kwindowsystem, - # kglobalaccel, - # kinit, - # kwin, - # kio, - # kguiaddons, - # kcoreaddons, + # kwindowsystem, podofo, mpv, ffmpeg_5-full, diff --git a/shell.nix b/shell.nix index 5687495..174b66a 100644 --- a/shell.nix +++ b/shell.nix @@ -28,14 +28,14 @@ mkShell rec { qt5.qtmultimedia qt5.qtwayland libsForQt5.kirigami2 - libsForQt5.breeze-icons - libsForQt5.breeze-qt5 + # libsForQt5.breeze-icons + # libsForQt5.breeze-qt5 libsForQt5.qqc2-desktop-style libsForQt5.karchive # libsForQt5.kirigami-addons - libsForQt5.ki18n - libsForQt5.kcoreaddons - libsForQt5.kguiaddons + # libsForQt5.ki18n + # libsForQt5.kcoreaddons + # libsForQt5.kguiaddons # libsForQt5.kconfig podofo diff --git a/src/main.cpp b/src/main.cpp index fc88ebb..5d9515a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +// #include #include #include #include