mirror of
https://github.com/nix-community/nixvim.git
synced 2026-08-24 02:34:15 -05:00
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.
This commit is contained in:
@@ -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; };
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user