commit 59cb93ffa9270b9df6e1d709baa7da7a17084579
parent 2530f120c08276daa34c7c43b32dca9cd0e2a236
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Fri, 22 Aug 2025 12:11:17 +0200
parent 2530f120c08276daa34c7c43b32dca9cd0e2a236
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Fri, 22 Aug 2025 12:11:17 +0200
packages: add `default.nix`
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/flake.nix b/flake.nix @@ -47,17 +47,11 @@ inherit lib; - formatter = lib.forAllSystems { body = (pkgs: pkgs.nixfmt-rfc-style); }; + formatter = lib.forAllSystems { body = pkgs: pkgs.nixfmt-rfc-style; }; packages = lib.forAllSystems { - body = ( - pkgs: - nixpkgsLib.packagesFromDirectoryRecursive { - directory = ./packages; - callPackage = - path: scope: pkgs.callPackage path (scope // { tgcMaintainers = maintainersAttrset; }); - } - ); + nixpkgsOverlays = builtins.attrValues inputs.self.overlays; + body = pkgs: import ./packages pkgs; }; overlays = (import ./overlays) // { @@ -68,7 +62,7 @@ lib = prev.lib.extend (_: _: { tgc = lib; }); }; packages = final: prev: { - tgc = inputs.self.packages.${prev.system}; + tgc = import ./packages prev; }; emacs-overlay = inputs.emacs-overlay.overlays.package; default = inputs.self.overlays.packages;
diff --git a/lib/forAllSystems.nix b/lib/forAllSystems.nix @@ -10,13 +10,13 @@ "aarch64-linux" ], nixpkgs ? inputs.nixpkgs, - overlays ? (builtins.attrValues inputs.self.overlays), + nixpkgsOverlays ? [ ], }: lib.genAttrs systems ( system: body ( import nixpkgs { - inherit system overlays; + inherit system nixpkgsOverlays; } ) );
diff --git a/packages/default.nix b/packages/default.nix @@ -0,0 +1,6 @@ +pkgs: +pkgs.lib.packagesFromDirectoryRecursive { + directory = ./.; + callPackage = + path: scope: pkgs.callPackage path (scope // { tgcMaintainers = import ../maintainers.nix; }); +}