mirror of
https://github.com/hyprwm/hyprutils.git
synced 2025-12-20 04:40:08 +01:00
Nix: move overlays to nix/ and add debug package
This commit is contained in:
parent
c9cd5f153c
commit
15df5e39af
3 changed files with 27 additions and 19 deletions
20
flake.nix
20
flake.nix
|
|
@ -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);
|
||||||
|
|
|
||||||
|
|
@ -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
23
nix/overlays.nix
Normal 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;};
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Reference in a new issue