diff --git a/flake.nix b/flake.nix index 2a4126c..2aa53d9 100644 --- a/flake.nix +++ b/flake.nix @@ -135,11 +135,10 @@ }; overlays = { - nixfilesInputs = import ./flake/inputs-overlay.nix inputs; - clerie = import ./pkgs/overlay.nix; + clerie-inputs = import ./flake/inputs-overlay.nix inputs; + clerie-pkgs = import ./pkgs/overlay.nix; clerie-build-support = import ./pkgs/build-support/overlay.nix; clerie-overrides = import ./pkgs/overrides/overlay.nix; - default = self.overlays.clerie; }; packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: @@ -147,7 +146,7 @@ pkgs = localNixpkgs.${system}; in nixpkgs.lib.genAttrs ( - (builtins.attrNames (self.overlays.clerie null null)) + (builtins.attrNames (self.overlays.clerie-pkgs null null)) ++ (builtins.attrNames (self.overlays.clerie-overrides null null)) ) (name: pkgs."${name}") ); diff --git a/flake/nixpkgs.nix b/flake/nixpkgs.nix index b9bf32e..4a8a64d 100644 --- a/flake/nixpkgs.nix +++ b/flake/nixpkgs.nix @@ -8,8 +8,8 @@ let import nixpkgs { inherit system; overlays = [ - self.overlays.nixfilesInputs - self.overlays.clerie + self.overlays.clerie-inputs + self.overlays.clerie-pkgs (final: prev: { clerie-build-support = self.overlays.clerie-build-support final prev; })