CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(nix): don't concat final attr in fixed point

Browse Source 
Signed-off-by: seth <getchoo@tuta.io>
This commit is contained in:
seth 2023-09-09 14:32:50 -04:00
parent 78f8a31cd6
commit 89e434bd5b
No known key found for this signature in database
GPG Key ID: D31BD0D494BBEE86
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nix/distribution.nix
View File

@ -9,7 +9,7 @@
... ...
}: { }: {
packages = let packages = let
ourPackages = lib.fix (final: self.overlays.default ({inherit (pkgs) darwin;} // final) pkgs); ourPackages = lib.fix (final: self.overlays.default final pkgs);
in { in {
inherit inherit
(ourPackages) (ourPackages)
@ -29,16 +29,21 @@
# common args for prismlauncher evaluations # common args for prismlauncher evaluations
unwrappedArgs = { unwrappedArgs = {
inherit (inputs) libnbtplusplus; inherit (inputs) libnbtplusplus;
inherit (final.darwin.apple_sdk.frameworks) Cocoa; inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) Cocoa;
inherit self version; inherit self version;
}; };
in { in {
prismlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs; prismlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs;
prismlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix { prismlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix {
prismlauncher-unwrapped = final.prismlauncher-qt5-unwrapped; prismlauncher-unwrapped = final.prismlauncher-qt5-unwrapped;
}; };
prismlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs; prismlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs;
prismlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {inherit (final) prismlauncher-unwrapped;};
prismlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {
inherit (final) prismlauncher-unwrapped;
};
}; };
}; };
} }