Skip to content

Dev #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nhktmdzhg merged 4 commits into from
May 14, 2026
+9 −8
Merged

Dev #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3efc909
chore(nix): update `flake.lock`
justanoobcoder May 14, 2026
36593c3
fix(nix): build failed due to extra-cmake-modules required from kdePa…
justanoobcoder May 14, 2026
5703d4f
style(nix): format
justanoobcoder May 14, 2026
03788fd
Merge pull request #280 from justanoobcoder/dev
nhktmdzhg May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions nix/packages/fcitx5-lotus/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
stdenv,
buildGoModule,
cmake,
extra-cmake-modules,
fcitx5,
fetchFromGitHub,
gettext,
go,
hicolor-icon-theme,
kdePackages,
libinput,
libx11,
pkg-config,
Expand All @@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cmake
extra-cmake-modules
kdePackages.extra-cmake-modules
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

When using kdePackages.extra-cmake-modules, it is recommended to also use kdePackages.qtbase and kdePackages.wrapQtAppsHook (instead of the top-level qt6 attributes) to ensure that all Qt/KDE components are sourced from the same consistent package set. This prevents potential issues with mismatched Qt versions in the build environment.

gettext
go
hicolor-icon-theme
Expand All @@ -42,12 +42,13 @@ stdenv.mkDerivation rec {
fcitx5
libinput
libx11
(python3.withPackages (ps:
with ps; [
(python3.withPackages (
ps: with ps; [
pyqt6
dbus-python
qtpy
]))
]
))
Comment on lines +45 to +51
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The reformatted Python package list is unnecessarily verbose and continues to use the with keyword, which is generally discouraged in Nixpkgs as it can lead to scoping issues and makes it less clear where each package originates. A more idiomatic and concise approach is to access the packages directly from the ps argument.

    (python3.withPackages (ps: [
      ps.pyqt6
      ps.dbus-python
      ps.qtpy
    ]))

qt6.qtbase
udev
];
Expand Down
Loading