diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-13 15:05:15 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-13 15:05:15 -0400 |
| commit | 0f72effdd96e46401b5c3c3a6839f9c880822585 (patch) | |
| tree | a672f66d18f4a67aff3d83ce34b55b642c9b11f9 | |
| parent | afc1f7ca15de749131cf4483b9c3d4da493d554b (diff) | |
| download | nixlib-0f72effdd96e46401b5c3c3a6839f9c880822585.tar nixlib-0f72effdd96e46401b5c3c3a6839f9c880822585.tar.gz nixlib-0f72effdd96e46401b5c3c3a6839f9c880822585.tar.bz2 nixlib-0f72effdd96e46401b5c3c3a6839f9c880822585.tar.lz nixlib-0f72effdd96e46401b5c3c3a6839f9c880822585.tar.xz nixlib-0f72effdd96e46401b5c3c3a6839f9c880822585.tar.zst nixlib-0f72effdd96e46401b5c3c3a6839f9c880822585.zip | |
The derivation primop doesn't play well with null outputs attribute
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 6 |
1 files 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; }; |