From 094bf83b26f396e9d7171fe770303eda0f14187d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 12:25:53 -0700
Subject: [PATCH] Fix the usage of cross packages during nix-env listings

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c436808c78..d71e3c4393e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5155,7 +5155,7 @@ let
     gold = false;
   });
 
-  binutilsCross = lowPrio (forceNativeDrv (
+  binutilsCross = assert crossSystem != null; lowPrio (forceNativeDrv (
     if crossSystem.libc == "libSystem" then darwin.cctools_cross
     else binutils.override {
       noSysDirs = true;
@@ -6152,7 +6152,7 @@ let
     else if name == "libSystem" then darwin.xcode
     else throw "Unknown libc";
 
-  libcCross = libcCrossChooser crossSystem.libc;
+  libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
 
   # Only supported on Linux
   glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;