diff options
| author | Artturi <Artturin@artturin.com> | 2022-09-14 19:15:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-14 19:15:23 +0300 |
| commit | dbc00be4985fdef654656092feb35ca2412f2a2b (patch) | |
| tree | e193d2c3b77db0a33bd8efcec0d53ba19dd3bec3 /nixos | |
| parent | 9c33e0ef7364ba7d0f876bf95abe3b6c867491f4 (diff) | |
| parent | 4770866f937654609fc0abcd6a486999f3a1ed3e (diff) | |
Merge pull request #190358 from ck3d/fix-nixos-cross
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/logging/vector.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 80b8ef591d3ae..e8becb6bf8cc7 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -337,7 +337,7 @@ in config = { _module.args = { - pkgs = finalPkgs; + pkgs = finalPkgs.__splicedPackages; }; assertions = [ diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix index ab5ea887acbac..1803ea85e49c8 100644 --- a/nixos/modules/services/logging/vector.nix +++ b/nixos/modules/services/logging/vector.nix @@ -44,7 +44,7 @@ in conf = format.generate "vector.toml" cfg.settings; validateConfig = file: pkgs.runCommand "validate-vector-conf" { - nativeBuildInputs = [ pkgs.buildPackages.vector ]; + nativeBuildInputs = [ pkgs.vector ]; } '' vector validate --no-environment "${file}" ln -s "${file}" "$out" |