diff --git a/flake.nix b/flake.nix index 550c69f..cf23de3 100644 --- a/flake.nix +++ b/flake.nix @@ -170,7 +170,9 @@ atool-wrapped = packages.atool; }; in [ + # TODO delete this, transfer all packages to new-packages overlay packagesOverlay + self.overlays.new-packages # various temporary fixes that automatically revert self.overlays.mitigations diff --git a/pkgs/module.nix b/pkgs/module.nix index 47d1542..42c7fc3 100644 --- a/pkgs/module.nix +++ b/pkgs/module.nix @@ -1,11 +1,32 @@ -{ config, lib, ... }: { - imports = [ ./legacy-module.nix ]; + config, + lib, + ... +}: { + imports = [./legacy-module.nix]; config = { - perSystem = { system, inputs', self', pkgs, ...}: { + perSystem = { + system, + inputs', + self', + pkgs, + ... + }: { packages = { - lucem = pkgs.callPackage ./lucem { }; + lucem = pkgs.callPackage ./lucem {}; }; }; + + flake = { + overlays.new-packages = final: prev: let + inherit (final) callPackage; + currentSystem = config.perSystem "${prev.system}"; + flakePackages = currentSystem.packages; + addPackages = packages: lib.genAttrs packages (package: callPackage flakePackages.${package}.override {}); + in + addPackages [ + "lucem" + ]; + }; }; }