Nix: move overlays to nix/ and add debug package

This commit is contained in:
Mihai Fufezan 2025-02-17 18:52:32 +02:00
parent c9cd5f153c
commit 15df5e39af
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
3 changed files with 27 additions and 19 deletions

View file

@ -18,28 +18,12 @@
localSystem.system = system; localSystem.system = system;
overlays = with self.overlays; [hyprutils]; overlays = with self.overlays; [hyprutils];
}); });
mkDate = longDate: (lib.concatStringsSep "-" [
(builtins.substring 0 4 longDate)
(builtins.substring 4 2 longDate)
(builtins.substring 6 2 longDate)
]);
version = lib.removeSuffix "\n" (builtins.readFile ./VERSION);
in { in {
overlays = { overlays = import ./nix/overlays.nix {inherit self lib;};
default = self.overlays.hyprutils;
hyprutils = final: prev: {
hyprutils = final.callPackage ./nix/default.nix {
stdenv = final.gcc15Stdenv;
version = version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
};
hyprutils-with-tests = final.hyprutils.override {doCheck = true;};
};
};
packages = eachSystem (system: { packages = eachSystem (system: {
default = self.packages.${system}.hyprutils; default = self.packages.${system}.hyprutils;
inherit (pkgsFor.${system}) hyprutils hyprutils-with-tests; inherit (pkgsFor.${system}) hyprutils hyprutils-debug hyprutils-with-tests;
}); });
formatter = eachSystem (system: pkgsFor.${system}.alejandra); formatter = eachSystem (system: pkgsFor.${system}.alejandra);

View file

@ -11,6 +11,7 @@
}: let }: let
inherit (builtins) foldl'; inherit (builtins) foldl';
inherit (lib.lists) flatten; inherit (lib.lists) flatten;
inherit (lib.strings) optionalString;
adapters = flatten [ adapters = flatten [
stdenvAdapters.useMoldLinker stdenvAdapters.useMoldLinker
@ -20,7 +21,7 @@
customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters; customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters;
in in
customStdenv.mkDerivation { customStdenv.mkDerivation {
pname = "hyprutils"; pname = "hyprutils" + optionalString debug "-debug";
inherit version doCheck; inherit version doCheck;
src = ../.; src = ../.;

23
nix/overlays.nix Normal file
View file

@ -0,0 +1,23 @@
{
self,
lib,
}: let
mkDate = longDate: (lib.concatStringsSep "-" [
(builtins.substring 0 4 longDate)
(builtins.substring 4 2 longDate)
(builtins.substring 6 2 longDate)
]);
ver = lib.removeSuffix "\n" (builtins.readFile ../VERSION);
version = ver + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
in {
default = self.overlays.hyprutils;
hyprutils = final: prev: {
hyprutils = final.callPackage ./default.nix {
stdenv = final.gcc15Stdenv;
inherit version;
};
hyprutils-debug = final.hyprutils.override {debug = true;};
hyprutils-with-tests = final.hyprutils.override {doCheck = true;};
};
}