kyle/kte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos and qt fixup

Browse Source
This commit is contained in:
Kyle Isom
2025-12-05 09:25:48 -08:00
parent fd517b5d57
commit 51ea473a91
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
QtFrontend.cc
View File

@@ -142,9 +142,11 @@ protected:
p.save(); p.save();
p.setClipRect(viewport); p.setClipRect(viewport);
// Iterate visible lines // Iterate visible lines
for (std::size_t i = rowoffs, vis_idx = 0; i < last_row; ++i, ++vis_idx) { for (std::size_t i = rowoffs, vis_idx = 0; i < last_row; ++i, ++vis_idx) {
const auto &line = static_cast<const std::string &>(lines[i]); // Materialize the Buffer::Line into a std::string for
// regex/iterator usage and general string ops.
const std::string line = static_cast<std::string>(lines[i]);
const int y = viewport.y() + static_cast<int>(vis_idx) * line_h; const int y = viewport.y() + static_cast<int>(vis_idx) * line_h;
const int baseline = y + fm.ascent(); const int baseline = y + fm.ascent();

10
default.nix
View File

@@ -6,8 +6,9 @@
SDL2, SDL2,
libGL, libGL,
xorg, xorg,
kdePackages,
qt6Packages ? kdePackages.qt6Packages,
installShellFiles, installShellFiles,
graphical ? false, graphical ? false,
graphical-qt ? false, graphical-qt ? false,
... ...
@@ -37,12 +38,13 @@ stdenv.mkDerivation {
xorg.libX11 xorg.libX11
] ]
++ lib.optionals graphical-qt [ ++ lib.optionals graphical-qt [
qt5Full kdePackages.qt6ct
qtcreator ## not sure if this is actually needed qt6Packages.qtbase
qt6Packages.wrapQtAppsHook
]; ];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_GUI=${if graphical or graphical-qt then "ON" else "OFF"}" "-DBUILD_GUI=${if graphical then "ON" else "OFF"}"
"-DKTE_USE_QT=${if graphical-qt then "ON" else "OFF"}" "-DKTE_USE_QT=${if graphical-qt then "ON" else "OFF"}"
"-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_BUILD_TYPE=Debug"
]; ];

6
flake.nix
View File

@@ -13,9 +13,9 @@
packages = eachSystem (system: rec { packages = eachSystem (system: rec {
default = kte; default = kte;
full = kge; full = kge;
kte = (pkgsFor system).callPackage ./default.nix { graphical = false; }; kte = (pkgsFor system).callPackage ./default.nix { graphical = false; graphical-qt = false; };
kge = (pkgsFor system).callPackage ./default.nix { graphical = true; }; kge = (pkgsFor system).callPackage ./default.nix { graphical = true; graphical-qt = false; };
qt = (pkgsFor system).callPackage ./default.nix { graphical-qt = true; }; qt = (pkgsFor system).callPackage ./default.nix { graphical = true; graphical-qt = true; };
}); });
}; };
} }