zach/z-bar-qt
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Nix packaging #6

Merged
AramMarkarov merged 5 commits from nix_packaging into main 2026-02-08 18:15:16 +01:00
Conversation 0 Commits 5 Files Changed 8
+14 -3
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5718b58ab - Show all commits
CMakeLists.txt
+3 -2
View File
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
include(GNUInstallDirs)
project(ZShell) project(ZShell)
@@ -8,8 +9,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir") set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir") set(INSTALL_QMLDIR "${CMAKE_INSTALL_LIBDIR}/qt6/qml" CACHE STRING "QML install dir")
add_compile_options( add_compile_options(
-Wall -Wextra -Wpedantic -Wshadow -Wconversion -Wall -Wextra -Wpedantic -Wshadow -Wconversion
flake.nix
+11 -1
View File
@@ -23,7 +23,17 @@
formatter = forAllSystems (pkgs: pkgs.nixfmt); formatter = forAllSystems (pkgs: pkgs.nixfmt);
packages = forAllSystems (pkgs: rec { packages = forAllSystems (pkgs: rec {
app2unit = pkgs.callPackage ./nix/app2unit.nix { inherit pkgs; }; 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: { devShells = forAllSystems (pkgs: {