diff options
| author | seth <[email protected]> | 2023-09-09 17:57:12 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2023-09-09 17:57:12 -0400 |
| commit | 8acf3d84b959e11e4b0caba0588b0b9794e67ae2 (patch) | |
| tree | d9db03846eb52ff8627cf1d3c261ef1406dee73e | |
| parent | e836acc0832f599de9b74224703cad06eafd38d5 (diff) | |
pkgs: don't concat fixed point
| -rw-r--r-- | pkgs/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/default.nix | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index 1e746c9..3dddad5 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -16,8 +16,8 @@ in { nixgc = callPackage ./nixgc.nix {}; modrinth-app-unwrapped = callPackage ./modrinth-app { - inherit (final.nodePackages) pnpm; - inherit (final.darwin.apple_sdk.frameworks) CoreServices Security WebKit; + inherit (final.nodePackages or prev.nodePackages) pnpm; + inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) CoreServices Security WebKit; }; modrinth-app = callPackage ./modrinth-app/wrapper.nix { diff --git a/pkgs/default.nix b/pkgs/default.nix index e66c1d3..b54c0fa 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,10 +9,7 @@ inherit (builtins) elem; inherit (lib) filterAttrs fix; - unfiltered = fix ( - final: - self.overlays.default (final // {inherit (pkgs) nodePackages darwin;}) pkgs - ); + unfiltered = fix (final: self.overlays.default final pkgs); p = filterAttrs (_: v: elem system (v.meta.platforms or []) && !(v.meta.broken or false)) |