diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/default.nix | 19 |
2 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index 1709f66..38f95f0 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -17,12 +17,14 @@ in { nixgc = callPackage ./nixgc.nix {}; - modrinth-app-unwrapped = final.callPackage ./modrinth-app { - inherit (prev.nodePackages) pnpm; - inherit (prev.darwin.apple_sdk.frameworks) CoreServices Security WebKit; + modrinth-app-unwrapped = callPackage ./modrinth-app { + inherit (final.nodePackages) pnpm; + inherit (final.darwin.apple_sdk.frameworks) CoreServices Security WebKit; }; - modrinth-app = final.callPackage ./modrinth-app/wrapper.nix {}; + modrinth-app = callPackage ./modrinth-app/wrapper.nix { + inherit (final) modrinth-app-unwrapped; + }; treefetch = callPackage ./treefetch.nix {}; diff --git a/pkgs/default.nix b/pkgs/default.nix index 399a8fd..e66c1d3 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -_: { +{self, ...}: { perSystem = { lib, pkgs, @@ -7,15 +7,16 @@ _: { }: { packages = let inherit (builtins) elem; - inherit (lib) filterAttrs makeScope; - inherit (pkgs) newScope; + inherit (lib) filterAttrs fix; - p = let - packages = makeScope newScope (final: import ./all-packages.nix final pkgs); - in - filterAttrs (_: v: - elem system (v.meta.platforms or []) && !(v.meta.broken or false)) - packages; + unfiltered = fix ( + final: + self.overlays.default (final // {inherit (pkgs) nodePackages darwin;}) pkgs + ); + + p = filterAttrs (_: v: + elem system (v.meta.platforms or []) && !(v.meta.broken or false)) + unfiltered; in p // {default = p.treefetch;}; }; |