mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-20 16:15:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

modules/nixpkgs: don't assign elaborated platforms

Browse source 
See https://github.com/NixOS/nixpkgs/pull/376988
This commit is contained in:
Matt Sturgeon 2025-02-04 18:25:33 +00:00
parent 6288354d43
commit f99264c1fb
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/top-level/nixpkgs.nix
View file

@ -146,7 +146,9 @@ in
example = { example = {
system = "aarch64-linux"; system = "aarch64-linux";
}; };
apply = lib.systems.elaborate; # FIXME: An elaborated platform is not supported,
# but an `apply` function is probably still needed.
# See https://github.com/NixOS/nixpkgs/pull/376988
defaultText = lib.literalMD '' defaultText = lib.literalMD ''
- Inherited from the "host" configuration's `pkgs` - Inherited from the "host" configuration's `pkgs`
- Or `evalNixvim`'s `system` argument - Or `evalNixvim`'s `system` argument
@ -167,14 +169,9 @@ in
example = { example = {
system = "x86_64-linux"; system = "x86_64-linux";
}; };
apply = # FIXME: An elaborated platform is not supported,
value: # but an `apply` function is probably still needed.
let # See https://github.com/NixOS/nixpkgs/pull/376988
elaborated = lib.systems.elaborate value;
in
# If equivalent to `hostPlatform`, make it actually identical so that `==` can be used
# See https://github.com/NixOS/nixpkgs/issues/278001
if lib.systems.equals elaborated cfg.hostPlatform then cfg.hostPlatform else elaborated;
defaultText = lib.literalMD '' defaultText = lib.literalMD ''
Inherited from the "host" configuration's `pkgs`. Inherited from the "host" configuration's `pkgs`.
Or `config.nixpkgs.hostPlatform` when building a standalone nixvim. Or `config.nixpkgs.hostPlatform` when building a standalone nixvim.
@ -215,9 +212,13 @@ in
inherit (cfg) config overlays; inherit (cfg) config overlays;
}; };
elaborated = builtins.mapAttrs (_: lib.systems.elaborate) {
inherit (cfg) buildPlatform hostPlatform;
};
# Configure `localSystem` and `crossSystem` as required # Configure `localSystem` and `crossSystem` as required
systemArgs = systemArgs =
if cfg.buildPlatform == cfg.hostPlatform then if lib.systems.equals elaborated.buildPlatform elaborated.hostPlatform then
{ {
localSystem = cfg.hostPlatform; localSystem = cfg.hostPlatform;
} }

6
wrappers/_shared.nix
View file

@ -39,9 +39,9 @@ let
# Use global packages in nixvim's submodule # Use global packages in nixvim's submodule
pkgs = lib.mkIf config.nixpkgs.useGlobalPackages (lib.mkDefault pkgs); pkgs = lib.mkIf config.nixpkgs.useGlobalPackages (lib.mkDefault pkgs);
# Inherit platform spec # Inherit platforms
hostPlatform = lib.mkOptionDefault pkgs.stdenv.hostPlatform; hostPlatform = lib.mkOptionDefault pkgs.stdenv.hostPlatform.system;
buildPlatform = lib.mkOverride buildPlatformPrio pkgs.stdenv.buildPlatform; buildPlatform = lib.mkOverride buildPlatformPrio pkgs.stdenv.buildPlatform.system;
}; };
}; };