From 70176cfc488aafaf933fb16e312ac38dce76a635 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 9 Jul 2021 18:20:27 +0200 Subject: modules/core: Fix order of Vuizvui pkgs namespace So far, we have passed self instead of super to our custom package set, but this makes it very hard when overriding other packages and refering to one of these packages in Vuizvui. To fix this, I not only used mkBefore to make sure that the overlay comes before every other overlay but also using super makes sure that whenever we do overrides in Vuizvui, the package *before* the current overlay is selected instead of possibly running into an infinite recursion. Signed-off-by: aszlig --- modules/core/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/core') diff --git a/modules/core/common.nix b/modules/core/common.nix index acf00a60..d05c54dd 100644 --- a/modules/core/common.nix +++ b/modules/core/common.nix @@ -40,9 +40,9 @@ in { config = { # Expose all packages in ../../pkgs as pkgs.vuizvui in modules. - nixpkgs.overlays = singleton (pkgs: const { - vuizvui = import ../../pkgs { inherit pkgs; }; - }); + nixpkgs.overlays = lib.mkBefore (lib.singleton (lib.const (super: { + vuizvui = import ../../pkgs { pkgs = super; }; + }))); nix.binaryCaches = [ "https://headcounter.org/hydra/" ]; nix.binaryCachePublicKeys = [ -- cgit 1.4.1