From e85b3647481f4af5638673837814c2f8835e4054 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 20 Aug 2024 02:04:05 -0400 Subject: [PATCH] refactor(nix): use `final` in overlay this allows to implictly pass `prismlauncher-unwrapped` it won't have an effect on our package set as directly inheriting from the scope we create filters out the extra attributes usually introduced with a scope Signed-off-by: seth --- nix/distribution.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nix/distribution.nix b/nix/distribution.nix index ac7fc9871..74e77da1b 100644 --- a/nix/distribution.nix +++ b/nix/distribution.nix @@ -5,7 +5,7 @@ { packages = let - ourPackages = lib.fix (final: self.overlays.default final pkgs); + ourPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs); in { inherit (ourPackages) prismlauncher-unwrapped prismlauncher; @@ -25,9 +25,7 @@ inherit version; }; - prismlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix { - inherit (final) prismlauncher-unwrapped; - }; + prismlauncher = final.callPackage ./pkg/wrapper.nix { }; }; }; }