NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-09-11 12:05:26 +03:00
Code Issues Projects Releases Wiki Activity

release.nix: Fix oversight with kernel builders

Browse Source 
This way we finally have an error-free eval.
This commit is contained in:
Samuel Dionne-Riel 2021-02-24 17:43:39 -05:00
parent dfd39a16cb
commit 36cff692b2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
release.nix
View File

@ -58,11 +58,10 @@ let
let
# Trick the overlay in giving us its attributes.
# Using the values is likely to fail. Thank lazyness!
overlay = import ./overlay/overlay.nix {} {};
overlayAttrNames = builtins.attrNames (import ./overlay/overlay.nix {} {});
in
eval:
(lib.genAttrs (builtins.attrNames overlay) (name: eval.pkgs.${name})) //
{
eval: let overlay = (lib.genAttrs overlayAttrNames (name: eval.pkgs.${name})); in
overlay // {
# We only "monkey patch" over top of the main nixos one.
xorg = {
xf86videofbdev = eval.pkgs.xorg.xf86videofbdev;
@ -71,9 +70,12 @@ let
# lib-like attributes...
# How should we handle these?
imageBuilder = null;
kernel-builder = null;
kernel-builder-gcc49 = null;
kernel-builder-gcc6 = null;
mobile-nixos = overlay.mobile-nixos // {
kernel-builder = null;
kernel-builder-clang_9 = null;
kernel-builder-gcc49 = null;
kernel-builder-gcc6 = null;
};
# Also lib-like, but a "global" like attribute :/
defaultKernelPatches = null;