public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shea Levy 2014-03-13 15:05:15 -04:00
parent afc1f7ca15
commit 0f72effdd9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/manual-config.nix
View File

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