From 0f72effdd96e46401b5c3c3a6839f9c880822585 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 13 Mar 2014 15:05:15 -0400
Subject: [PATCH] The derivation primop doesn't play well with null outputs
 attribute

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index ae226f0908b8..dd1998147602 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -38,7 +38,7 @@ in {
 
 let
   inherit (stdenv.lib)
-    hasAttr getAttr optional optionalString maintainers platforms;
+    hasAttr getAttr optional optionalString optionalAttrs maintainers platforms;
 
   installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
     #!${stdenv.shell} -e
@@ -73,9 +73,7 @@ let
 
       installsFirmware = (config.isEnabled "FW_LOADER") &&
         (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL"));
-    in {
-      outputs = if isModular then [ "out" "dev" ] else null;
-
+    in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
       passthru = {
         inherit version modDirVersion config kernelPatches;
       };