nixpkgs/pkgs
Matthew Bauer 31eac6fd00 impure.nix: fix handling of localSystem
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
2018-06-25 17:13:02 -04:00
..
applications rambox: fix build (#42577) 2018-06-25 21:29:25 +02:00
build-support cc-wrapper: disable stackprotector for mingw 2018-06-23 22:05:26 -04:00
common-updater
data treewide: http -> https 2018-06-23 04:34:55 -07:00
desktops mate.mate-terminal: 1.20.0 -> 1.20.1 (#42485) 2018-06-24 19:36:39 +02:00
development android: define __ANDROID_API__ in cflags 2018-06-25 17:12:52 -04:00
games Merge pull request #42432 from Pneumaticat/multimc 2018-06-25 11:53:02 +02:00
misc rpcs3: 0.0.4-8032 -> 0.0.5-6980 (#41414) 2018-06-25 11:45:50 +02:00
os-specific libiconv: add "enableShared" option 2018-06-25 17:10:11 -04:00
servers Merge pull request #42542 from nh2/consul-alerts-0.5.0 2018-06-25 18:08:54 +02:00
shells Merge branch 'master' into staging 2018-06-20 18:17:18 +02:00
stdenv Merge staging into master 2018-06-23 08:23:24 +02:00
test Merge remote-tracking branch 'upstream/master' into staging 2018-06-18 15:30:39 -04:00
tools xidlehook: 0.4.8 -> 0.4.9 (#42573) 2018-06-25 21:18:57 +02:00
top-level impure.nix: fix handling of localSystem 2018-06-25 17:13:02 -04:00