Unverified Commit dbc00be4 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #190358 from ck3d/fix-nixos-cross

parents 9c33e0ef 4770866f

nixos/modules/misc/nixpkgs.nix

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ in 


  config = {

    _module.args = {

      pkgs = finalPkgs;

      pkgs = finalPkgs.__splicedPackages;

    };



    assertions = [

nixos/modules/services/logging/vector.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"