From f7077ba1311a49c91493a6696f4ec0dd568f297a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 8 Sep 2022 18:32:45 +0200
Subject: [PATCH 1/2] nixos: Fix cross compilation of derivations defined in
 NixOS via pkgs

---
 nixos/modules/misc/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 = [

From 4770866f937654609fc0abcd6a486999f3a1ed3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 11 Sep 2022 17:11:47 +0200
Subject: [PATCH 2/2] nixos/vector: remove no longer required workaround for
 cross compiling

---
 nixos/modules/services/logging/vector.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"