mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 20:20:26 +03:00
Merge pull request #22592 from Ericson2314/localSystem-fix
top-level: Hack around Nix's --arg logic not handling unnamed params
This commit is contained in:
commit
18da9bc809
@ -18,6 +18,11 @@ in
|
|||||||
# so we do it now.
|
# so we do it now.
|
||||||
localSystem ? builtins.intersectAttrs { system = null; platform = null; } args
|
localSystem ? builtins.intersectAttrs { system = null; platform = null; } args
|
||||||
|
|
||||||
|
, # These are needed only because nix's `--arg` command-line logic doesn't work
|
||||||
|
# with unnamed parameters allowed by ...
|
||||||
|
system ? localSystem.system
|
||||||
|
, platform ? localSystem.platform
|
||||||
|
|
||||||
, # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
|
, # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
|
||||||
# $HOME/.config/nixpkgs/config.nix.
|
# $HOME/.config/nixpkgs/config.nix.
|
||||||
config ? let
|
config ? let
|
||||||
|
Loading…
Reference in New Issue
Block a user