internal: rename assets -> extras

This commit is contained in:
2 * r + 2 * t 2025-09-04 22:47:40 +10:00
parent e739892046
commit e6483d7932
5 changed files with 12 additions and 12 deletions

View file

@ -34,7 +34,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(DISTRIBUTOR "Unset" CACHE STRING "Distributor")
set(ENABLE_MODULES "assets;plugin;shell" CACHE STRING "Modules to build/install")
set(ENABLE_MODULES "extras;plugin;shell" CACHE STRING "Modules to build/install")
set(INSTALL_LIBDIR "usr/lib/caelestia" CACHE STRING "Library install dir")
set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
set(INSTALL_QSCONFDIR "etc/xdg/quickshell/caelestia" CACHE STRING "Quickshell config install dir")
@ -51,8 +51,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wunused-lambda-capture)
endif()
if("assets" IN_LIST ENABLE_MODULES)
add_subdirectory(assets/cpp)
if("extras" IN_LIST ENABLE_MODULES)
add_subdirectory(extras)
endif()
if("plugin" IN_LIST ENABLE_MODULES)

View file

@ -49,7 +49,7 @@
shell = self.packages.${pkgs.system}.caelestia-shell;
in
pkgs.mkShell {
inputsFrom = [shell shell.plugin shell.assets];
inputsFrom = [shell shell.plugin shell.extras];
packages = with pkgs; [material-symbols rubik nerd-fonts.caskaydia-cove];
CAELESTIA_XKB_RULES_PATH = "${pkgs.xkeyboard-config}/share/xkeyboard-config-2/rules/base.lst";
};

View file

@ -61,18 +61,18 @@
(lib.cmakeFeature "DISTRIBUTOR" "nix-flake")
];
assets = stdenv.mkDerivation {
name = "caelestia-assets${lib.optionalString debug "-debug"}";
extras = stdenv.mkDerivation {
name = "caelestia-extras${lib.optionalString debug "-debug"}";
src = lib.fileset.toSource {
root = ./..;
fileset = lib.fileset.union ./../CMakeLists.txt ./../assets/cpp;
fileset = lib.fileset.union ./../CMakeLists.txt ./../extras;
};
nativeBuildInputs = [cmake ninja];
cmakeFlags =
[
(lib.cmakeFeature "ENABLE_MODULES" "assets")
(lib.cmakeFeature "ENABLE_MODULES" "extras")
(lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib")
]
++ cmakeVersionFlags;
@ -103,7 +103,7 @@ in
src = ./..;
nativeBuildInputs = [cmake ninja makeWrapper qt6.wrapQtAppsHook];
buildInputs = [quickshell assets plugin xkeyboard-config qt6.qtbase];
buildInputs = [quickshell extras plugin xkeyboard-config qt6.qtbase];
propagatedBuildInputs = runtimeDeps;
cmakeBuildType =
@ -128,16 +128,16 @@ in
makeWrapper ${quickshell}/bin/qs $out/bin/caelestia-shell \
--prefix PATH : "${lib.makeBinPath runtimeDeps}" \
--set FONTCONFIG_FILE "${fontconfig}" \
--set CAELESTIA_LIB_DIR ${assets}/lib \
--set CAELESTIA_LIB_DIR ${extras}/lib \
--set CAELESTIA_XKB_RULES_PATH ${xkeyboard-config}/share/xkeyboard-config-2/rules/base.lst \
--add-flags "-p $out/share/caelestia-shell"
mkdir -p $out/lib
ln -s ${assets}/lib/* $out/lib/
ln -s ${extras}/lib/* $out/lib/
'';
passthru = {
inherit plugin assets;
inherit plugin extras;
};
meta = {