diff --git a/pkgs/ui/default.nix b/pkgs/ui/default.nix index 7baba1fe..d6663919 100644 --- a/pkgs/ui/default.nix +++ b/pkgs/ui/default.nix @@ -1,7 +1,7 @@ -{ floco ? builtins.getFlake "github:aakropotkin/floco" -, system ? builtins.currentSystem -, pkgs ? import { currentSystem = system; } -, clanPkgs ? { } +{ floco +, system +, pkgs +, clanPkgs }: let @@ -39,4 +39,3 @@ in { inherit pkg fmod; } - diff --git a/pkgs/ui/flake-module.nix b/pkgs/ui/flake-module.nix index a0011af8..12335ec0 100644 --- a/pkgs/ui/flake-module.nix +++ b/pkgs/ui/flake-module.nix @@ -1,9 +1,9 @@ { self, ... }: { - perSystem = { pkgs, system, ... }: + perSystem = { self', pkgs, ... }: let inherit (self.inputs) floco; - base = pkgs.callPackage ./default.nix { inherit floco system; clanPkgs = self.packages.${system}; }; + base = pkgs.callPackage ./default.nix { inherit floco; clanPkgs = self'.packages; }; in { packages = { @@ -15,7 +15,7 @@ devShells.ui = pkgs.callPackage ./shell.nix { inherit pkgs; inherit (base) fmod pkg; - clanPkgs = self.packages.${system}; + clanPkgs = self'.packages; }; }; }