summary refs log tree commit diff
path: root/pkgs/stdenv/freebsd
diff options
context:
space:
mode:
authorJohn Ericson <jericson@galois.com>2016-11-30 18:51:13 -0500
committerJohn Ericson <jericson@galois.com>2016-12-01 11:24:33 -0500
commit4751d9e5ad124284dbd719d3a58f42d56f1b9514 (patch)
tree60531fd147f913face4de51a78c12ae9cc1dd18a /pkgs/stdenv/freebsd
parenta55d1ecc9050a50904a13e3a34535990b9e61ae3 (diff)
downloadnixpkgs-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar
nixpkgs-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.gz
nixpkgs-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.bz2
nixpkgs-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.lz
nixpkgs-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.xz
nixpkgs-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.zst
nixpkgs-4751d9e5ad124284dbd719d3a58f42d56f1b9514.zip
top-level: turn the screw
 - Non-cross stdenvs are honest and assert that `crossSystem` is null

 - `crossSystem` is a mandatory argument to top-level/stage.nix, just like
   `system` and `platform`

 - Broken default arguments on stdenvs for testing are gone.

 - All stdenvs (but little-used stdenvNix) take the same arguments for easy
   testing.
Diffstat (limited to 'pkgs/stdenv/freebsd')
-rw-r--r--pkgs/stdenv/freebsd/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 13cb21fe1d8..ea2ebcc7917 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,9 +1,9 @@
-{ system      ? builtins.currentSystem
-, allPackages ? import ../../..
-, platform    ? null
-, config      ? {}
+{ lib, allPackages
+, system, platform, crossSystem, config
 }:
 
+assert crossSystem == null;
+
 rec {
   inherit allPackages;