diff options
| author | seth <getchoo@tuta.io> | 2023-09-09 14:32:50 -0400 |
|---|---|---|
| committer | seth <getchoo@tuta.io> | 2023-09-09 15:25:33 -0400 |
| commit | 89e434bd5bedcd92bfa99102011607027be20060 (patch) | |
| tree | 96afdcc73601ce3c20d11f34a0a3a7da184682e4 /nix/distribution.nix | |
| parent | 78f8a31cd6f7e2ec8dc02ec2be847896df16758c (diff) | |
| download | PrismLauncher-89e434bd5bedcd92bfa99102011607027be20060.tar.gz PrismLauncher-89e434bd5bedcd92bfa99102011607027be20060.tar.bz2 PrismLauncher-89e434bd5bedcd92bfa99102011607027be20060.zip | |
refactor(nix): don't concat final attr in fixed point
Signed-off-by: seth <getchoo@tuta.io>
Diffstat (limited to 'nix/distribution.nix')
| -rw-r--r-- | nix/distribution.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nix/distribution.nix b/nix/distribution.nix index 6b93d355..c8fa01c5 100644 --- a/nix/distribution.nix +++ b/nix/distribution.nix @@ -9,7 +9,7 @@ ... }: { packages = let - ourPackages = lib.fix (final: self.overlays.default ({inherit (pkgs) darwin;} // final) pkgs); + ourPackages = lib.fix (final: self.overlays.default final pkgs); in { inherit (ourPackages) @@ -29,16 +29,21 @@ # common args for prismlauncher evaluations unwrappedArgs = { inherit (inputs) libnbtplusplus; - inherit (final.darwin.apple_sdk.frameworks) Cocoa; + inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) Cocoa; inherit self version; }; 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;}; + + prismlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix { + inherit (final) prismlauncher-unwrapped; + }; }; }; } |