From 0dbdd01812984be314a7d54f8bba9823616382ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 29 Jan 2023 13:50:23 -0300 Subject: [PATCH] overlays: fix system setting --- flake.nix | 2 +- overlays/default.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 52df737..a036e45 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,7 @@ packages = import ./pkgs { inherit pkgs inputs; }; - old_overlays = (import ./overlays (inputs // { inherit system packages; })); + old_overlays = (import ./overlays { inherit packages inputs; }); specialArgs = { inherit inputs; }; common_modules = [ diff --git a/overlays/default.nix b/overlays/default.nix index 9d626ad..e6c24f1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,4 @@ -(inputs@{ system, packages, ... }: rec { +{ inputs, packages, ... }: rec { all = [ nur scripts @@ -39,10 +39,10 @@ }); new-packages = (final: prev: packages // { - dhist = inputs.dhist.packages.${system}.dhist; - demoji = inputs.demoji.packages.${system}.demoji; - dzgui = inputs.dzgui.packages.${system}.dzgui; - devenv = inputs.devenv.packages.${system}.devenv; + dhist = inputs.dhist.packages.${prev.system}.dhist; + demoji = inputs.demoji.packages.${prev.system}.demoji; + dzgui = inputs.dzgui.packages.${prev.system}.dzgui; + devenv = inputs.devenv.packages.${prev.system}.devenv; mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper; sea-orm-cli = inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli; @@ -68,4 +68,4 @@ variables = (final: prev: { uservars = import ../user/variables.nix; }); -}) +}