attempt to fix broken app_id
This commit is contained in:
parent
24e3998a1f
commit
1d9dd95949
6 changed files with 22 additions and 17 deletions
|
@ -12,14 +12,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
|
||||
|
||||
set(TS_FILES swaymux_en_US.ts)
|
||||
# set(TS_FILES swaymux_en_US.ts)
|
||||
|
||||
set(PROJECT_SOURCES
|
||||
main.cpp
|
||||
mainwindow.cpp
|
||||
mainwindow.h
|
||||
mainwindow.ui
|
||||
${TS_FILES}
|
||||
# ${TS_FILES}
|
||||
tree/pstree.cpp
|
||||
tree/PsTreeModel.cpp
|
||||
sway_bindings/Formatter.h
|
||||
|
@ -79,7 +79,7 @@ set_target_properties(swaymux PROPERTIES
|
|||
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
|
||||
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
|
||||
MACOSX_BUNDLE TRUE
|
||||
WIN32_EXECUTABLE TRUE
|
||||
WIN32_EXECUTABLE FALSE
|
||||
)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
|
|
@ -81,7 +81,7 @@ public:
|
|||
}
|
||||
|
||||
std::string getDescription() override {
|
||||
return "Switch to selected container. If multiple containers or a container from scratchpad is selected,\ncreate new workspace and move all windows that are part of the selection to it.";
|
||||
return "Switch to selected container(s)";
|
||||
}
|
||||
|
||||
std::string getKeyText() override {
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1709905912,
|
||||
"narHash": "sha256-TofHtnlrOBCxtSZ9nnlsTybDnQXUmQrlIleXF1RQAwQ=",
|
||||
"lastModified": 1709968316,
|
||||
"narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a343533bccc62400e8a9560423486a3b6c11a23b",
|
||||
"rev": "0e7f98a5f30166cbed344569426850b21e4091d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
{
|
||||
description = "Swaymux: sway workspace/output/container navigation";
|
||||
|
||||
|
@ -22,12 +21,15 @@
|
|||
default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
# base toolchain
|
||||
gcc
|
||||
gcc12
|
||||
libgcc
|
||||
qt6.full
|
||||
qtcreator
|
||||
cmake
|
||||
nlohmann_json
|
||||
qtwayland
|
||||
qt6.qtwayland
|
||||
icu
|
||||
libcxx
|
||||
|
||||
# nix utils
|
||||
self.formatter.${pkgs.system}
|
||||
|
|
|
@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
// connect(modelUpdateTimer, &QTimer::timeout, this, QOverload<>::of(&MainWindow::update));
|
||||
// modelUpdateTimer->start(1000);
|
||||
|
||||
ui->statusbar->showMessage(QString::fromStdString("test test 123"));
|
||||
ui->statusbar->showMessage(QString::fromStdString("Press ? for keybind listing"));
|
||||
ui->treeView->setModel(model);
|
||||
ui->treeView->expandAll();
|
||||
|
||||
|
|
|
@ -2,13 +2,16 @@
|
|||
lib,
|
||||
nlohmann_json,
|
||||
cmake,
|
||||
stdenv,
|
||||
gcc12Stdenv,
|
||||
qt6,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
qtwayland
|
||||
qtwayland,
|
||||
icu,
|
||||
libgcc,
|
||||
libcxx
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
gcc12Stdenv.mkDerivation {
|
||||
pname = "swaymux";
|
||||
version = "0.1";
|
||||
|
||||
|
@ -19,7 +22,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make
|
||||
make -j
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
@ -27,8 +30,8 @@ stdenv.mkDerivation {
|
|||
mv swaymux $out/bin
|
||||
'';
|
||||
|
||||
buildInputs = [ qtbase qtwayland cmake nlohmann_json ];
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
buildInputs = [ icu qtbase qt6.qtwayland cmake nlohmann_json libgcc libcxx ];
|
||||
nativeBuildInputs = [ wrapQtAppsHook qt6.qtwayland ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
Loading…
Reference in a new issue