From adfa139f94e2249afa3acdc2e360749b727cf752 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 26 Jun 2026 22:44:57 -0500 Subject: [PATCH] wrappers: inherit platform config tuples Nixvim wrapper modules passed the host nixpkgs' fully elaborated stdenv.{host,build}Platform attrsets into Nixvim's own nixpkgs import. When the host and Nixvim nixpkgs revisions disagreed, those platform attrsets could be re-elaborated by a different lib.systems, causing eval recursion or platform-schema errors. Pass only { config = ...; } as the inherited platform spec instead. This keeps ABI/libc details while letting Nixvim's selected nixpkgs elaborate the platform itself. --- wrappers/_shared.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrappers/_shared.nix b/wrappers/_shared.nix index 8cecbd08..79a32879 100644 --- a/wrappers/_shared.nix +++ b/wrappers/_shared.nix @@ -44,8 +44,8 @@ let pkgs = lib.mkIf config.nixpkgs.useGlobalPackages (lib.mkDefault pkgs); # Inherit platform spec - hostPlatform = lib.mkOptionDefault pkgs.stdenv.hostPlatform; - buildPlatform = lib.mkOverride buildPlatformPrio pkgs.stdenv.buildPlatform; + hostPlatform = lib.mkOptionDefault { inherit (pkgs.stdenv.hostPlatform) config; }; + buildPlatform = lib.mkOverride buildPlatformPrio { inherit (pkgs.stdenv.buildPlatform) config; }; }; };