nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

internal: rename assets -> extras

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -34,7 +34,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(DISTRIBUTOR "Unset" CACHE STRING "Distributor") 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_LIBDIR "usr/lib/caelestia" CACHE STRING "Library install dir")
set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML 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") 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) add_compile_options(-Wunused-lambda-capture)
endif() endif()
if("assets" IN_LIST ENABLE_MODULES) if("extras" IN_LIST ENABLE_MODULES)
add_subdirectory(assets/cpp) add_subdirectory(extras)
endif() endif()
if("plugin" IN_LIST ENABLE_MODULES) if("plugin" IN_LIST ENABLE_MODULES)

0
assets/cpp/CMakeLists.txt → extras/CMakeLists.txt
View file

0
assets/cpp/version.cpp → extras/version.cpp
View file

2
flake.nix
View file

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

16
nix/default.nix
View file

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