This commit is contained in:
Zacharias-Brohn
2026-02-06 17:44:02 +01:00
parent 76c206ed91
commit e5718b58ab
2 changed files with 14 additions and 3 deletions
+3 -2
View File
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.19)
include(GNUInstallDirs)
project(ZShell)
@@ -8,8 +9,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
set(INSTALL_QMLDIR "${CMAKE_INSTALL_LIBDIR}/qt6/qml" CACHE STRING "QML install dir")
add_compile_options(
-Wall -Wextra -Wpedantic -Wshadow -Wconversion
+10
View File
@@ -23,7 +23,17 @@
formatter = forAllSystems (pkgs: pkgs.nixfmt);
packages = forAllSystems (pkgs: rec {
zshell = pkgs.callPackage ./nix {
rev = self.rev or self.dirtyRev;
stdenv = pkgs.clangStdenv;
quickshell = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
withX11 = false;
withI3 = false;
};
app2unit = pkgs.callPackage ./nix/app2unit.nix { inherit pkgs; };
};
default = zshell;
});
devShells = forAllSystems (pkgs: {