diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
| commit | 6973c7739ea1581595931e8c8b3b76241083b2df (patch) | |
| tree | f56826492e0e260f24aeeedd2e47d36785ba3519 /pkgs/stdenv/freebsd | |
| parent | 5dacc53af3f4537fab693952b5f13b6cafcde6d4 (diff) | |
| parent | bca9bcb3c3dd3b2e46f8e07db9a8326de01697c7 (diff) | |
| download | nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.gz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.bz2 nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.lz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.xz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.zst nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.zip | |
Merge branch 'master' into staging
There were some larger rebuilds because of security.
Diffstat (limited to 'pkgs/stdenv/freebsd')
| -rw-r--r-- | pkgs/stdenv/freebsd/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 2cb059deb34b..b926c6bdd901 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,8 +1,9 @@ { lib -, system, platform, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays }: assert crossSystem == null; +let inherit (localSystem) system; in [ @@ -58,7 +59,10 @@ assert crossSystem == null; }) (prevStage: { - inherit system crossSystem platform config overlays; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config overlays; stdenv = import ../generic { name = "stdenv-freebsd-boot-3"; inherit system config; |