Skip to content

build(nix): declare build inputs explicitly and fix dev shell env #1781

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

Open
mmclinton wants to merge 4 commits into
base: main
Choose a base branch
from
Open

build(nix): declare build inputs explicitly and fix dev shell env #1781

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
0ab07cf
fix(nix): declare wayland, x11 and openssl deps explicitly
Aug 10, 2026
5943d42
chore(nix): skip modules-load.d install in the nix build
Aug 10, 2026
441b65a
fix(nix): drop dead compiler exports from the dev shell
Aug 10, 2026
85521f6
fix(nix): expose the full qt env to qmlls
Aug 10, 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
14 changes: 6 additions & 8 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,12 @@
clang-tools
];

shellHook = pkgs.lib.optionalString isLinux ''
export CC=${pkgs.gcc15}/bin/gcc
export CXX=${pkgs.gcc15}/bin/g++
export CMAKE_C_COMPILER=$CC
export CMAKE_CXX_COMPILER=$CXX

export QML2_IMPORT_PATH=${pkgs.qt6.qtdeclarative}/lib/qt-6/qml
export QML_IMPORT_PATH=${pkgs.qt6.qtdeclarative}/lib/qt-6/qml
# qmlls discovers QML modules through these, so point them at the
# aggregate env: qtdeclarative alone hides LayerShellQt and the
# modules shipped by the other Qt packages.
shellHook = ''
export QML2_IMPORT_PATH=${qtEnv}/lib/qt-6/qml
export QML_IMPORT_PATH=${qtEnv}/lib/qt-6/qml
'';
};
}
Expand Down
19 changes: 19 additions & 0 deletions nix/vicinae.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,23 @@
kdePackages,
lib,
libqalculate,
libx11,
libxcb,
libxcb-keysyms,
libxkbcommon,
llvmPackages_21,
ninja,
nodejs,
npmHooks,
openssl,
pkg-config,
qt6,
stdenv,
gcc15Stdenv,
udev,
wayland,
wayland-protocols,
wayland-scanner,
glaze,
swift ? null,
apple-sdk ? null,
Expand Down Expand Up @@ -65,6 +73,7 @@ in
"VICINAE_GIT_TAG" = "v${finalAttrs.version}";
"VICINAE_GIT_COMMIT_HASH" = manifestGet "short_rev";
"VICINAE_PROVENANCE" = "nix";
"INSTALL_MODULES_LOAD_CONFIG" = "OFF";
"INSTALL_NODE_MODULES" = "OFF";
"USE_SYSTEM_CMARK_GFM" = "ON";
"USE_SYSTEM_GLAZE" = "ON";
Expand All @@ -91,6 +100,9 @@ in
qt6.qttools
qt6.wrapQtAppsHook
]
++ lib.optionals isLinux [
wayland-scanner
]
++ lib.optionals isDarwin [
swift
];
Expand All @@ -111,8 +123,15 @@ in
]
++ lib.optionals isLinux [
kdePackages.layer-shell-qt
libx11
libxcb
libxcb-keysyms
libxkbcommon
openssl
qt6.qtwayland
udev
wayland
wayland-protocols
]
++ lib.optionals isDarwin [
apple-sdk
Expand Down
Loading