From 262c21ed464a2593b54ec274a3b84083c0795f2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Mar 2013 19:42:01 +0100
Subject: [PATCH] Enable __ignoreNulls globally

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 2 --
 pkgs/stdenv/generic/default.nix                 | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 34e8f10dceee..29eb170287ad 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -162,8 +162,6 @@ stdenv.mkDerivation {
     fi
   '' else null;
 
-  __ignoreNulls = true;
-
   meta = {
     description = "The Linux kernel";
     license = "GPLv2";
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 26f410cee117..fd7b3218e347 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -6,6 +6,12 @@
   fetchurlBoot
 }:
 
+if ! builtins ? langVersion then
+
+  abort "This version of Nixpkgs requires Nix >= 1.2, please upgrade!"
+
+else
+
 let
 
   lib = import ../../lib;
@@ -30,6 +36,8 @@ let
 
         propagatedUserEnvPkgs = [gcc] ++
           lib.filter lib.isDerivation initialPath;
+
+        __ignoreNulls = true;
       }
 
       // rec {