diff options
| author | seth <getchoo@tuta.io> | 2023-09-03 18:11:23 -0400 |
|---|---|---|
| committer | seth <getchoo@tuta.io> | 2023-09-03 19:07:39 -0400 |
| commit | bbf4e3b04d98eac840134b1687aba63ec180ead0 (patch) | |
| tree | ccb66c9d817423feb42ebd70f68c8a488299bca3 /nix | |
| parent | 707da5a25a11a8ae6c60f619f37b9fdcb7970082 (diff) | |
| download | PrismLauncher-bbf4e3b04d98eac840134b1687aba63ec180ead0.tar.gz PrismLauncher-bbf4e3b04d98eac840134b1687aba63ec180ead0.tar.bz2 PrismLauncher-bbf4e3b04d98eac840134b1687aba63ec180ead0.zip | |
refactor(nix): use fixed points over rec
Signed-off-by: seth <getchoo@tuta.io>
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/distribution.nix | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/nix/distribution.nix b/nix/distribution.nix index 0dde1e4f..6b93d355 100644 --- a/nix/distribution.nix +++ b/nix/distribution.nix @@ -3,18 +3,28 @@ self, ... }: { - perSystem = {pkgs, ...}: { + perSystem = { + lib, + pkgs, + ... + }: { packages = let - ourPackages = self.overlays.default pkgs null; + ourPackages = lib.fix (final: self.overlays.default ({inherit (pkgs) darwin;} // final) pkgs); in { - inherit (ourPackages) prismlauncher-qt5-unwrapped prismlauncher-qt5 prismlauncher-unwrapped prismlauncher; + inherit + (ourPackages) + prismlauncher-qt5-unwrapped + prismlauncher-qt5 + prismlauncher-unwrapped + prismlauncher + ; default = ourPackages.prismlauncher; }; }; flake = { - overlays.default = final: _: let - version = builtins.substring 0 8 self.lastModifiedDate; + overlays.default = final: prev: let + version = builtins.substring 0 8 self.lastModifiedDate or "dirty"; # common args for prismlauncher evaluations unwrappedArgs = { @@ -22,11 +32,13 @@ inherit (final.darwin.apple_sdk.frameworks) Cocoa; inherit self version; }; - in rec { - prismlauncher-qt5-unwrapped = final.libsForQt5.callPackage ./pkg unwrappedArgs; - prismlauncher-qt5 = final.libsForQt5.callPackage ./pkg/wrapper.nix {prismlauncher-unwrapped = prismlauncher-qt5-unwrapped;}; - prismlauncher-unwrapped = final.qt6Packages.callPackage ./pkg unwrappedArgs; - prismlauncher = final.qt6Packages.callPackage ./pkg/wrapper.nix {inherit prismlauncher-unwrapped;}; + in { + prismlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs; + prismlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix { + prismlauncher-unwrapped = final.prismlauncher-qt5-unwrapped; + }; + prismlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs; + prismlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {inherit (final) prismlauncher-unwrapped;}; }; }; } |