The derivation primop doesn't play well with null outputs attribute

This commit is contained in:
Shea Levy 2014-03-13 15:05:15 -04:00
parent afc1f7ca15
commit 0f72effdd9

View File

@ -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;
};