ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

impure.nix: fix handling of localSystem

Browse Source 
If we passed a localSystem in, we don’t want the current system to
override it. Now we check for localSystem first to avoid getting
"mixed" localSystem values from commands like this:

  nix-build --arg localSystem '{config="x86_64-unknown-linux-musl";}' -A hello

Which would eventually evaluate localSystem to this:

{
  config = "x86_64-unknown-linux-musl";
  system = "x86_64-darwin";
}

& Nix would not be able to run it correctly.

Fixes #41599

/cc @Ericson2314
This commit is contained in:
Matthew Bauer 2018-06-24 23:15:09 -04:00
parent 5000cc555e
commit 31eac6fd00
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/impure.nix
View File

@ -83,5 +83,6 @@ import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
inherit config overlays crossSystem; inherit config overlays crossSystem;
# Fallback: Assume we are building packages on the current (build, in GNU # Fallback: Assume we are building packages on the current (build, in GNU
# Autotools parlance) system. # Autotools parlance) system.
localSystem = { system = builtins.currentSystem; } // localSystem; localSystem = (if args ? localSystem then {}
else { system = builtins.currentSystem; }) // localSystem;
}) })