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

Merge pull request #13745 from zohl/linux-chromiumos

Browse Source 
linux_chromiumos_3_14: kernel option fix
This commit is contained in:
Nikolay Amiantov 2016-03-08 13:57:32 +03:00
commit fedabe3334
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -478,7 +478,9 @@ with stdenv.lib;
''} ''}
${optionalString (versionAtLeast version "3.7") '' ${optionalString (versionAtLeast version "3.7") ''
MEDIA_USB_SUPPORT y MEDIA_USB_SUPPORT y
MEDIA_PCI_SUPPORT y ${optionalString (!(features.chromiumos or false)) ''
MEDIA_PCI_SUPPORT y
''}
''} ''}
# Our initrd init uses shebang scripts, so can't be modular. # Our initrd init uses shebang scripts, so can't be modular.