From 1f84e43239bc2a707c30c0d7bca47801e4df5a78 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 May 2016 18:03:12 +0200 Subject: [PATCH] Do some large, concurrency-capable builds on dedicated machines --- pkgs/applications/networking/browsers/chromium/browser.nix | 1 + pkgs/os-specific/linux/kernel/manual-config.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index a6e95ca51878..fe21642373ef 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -36,5 +36,6 @@ mkChromiumDerivation (base: rec { license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; + requiredSystemFeatures = [ "big-parallel" ]; }; }) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index ffe09cc2fee5..5f2bc2d2c55b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -125,7 +125,7 @@ let postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' - make $makeFlags "''${makeFlagsArray[@]}" dtbs + make $makeFlags "''${makeFlagsArray[@]}" dtbs mkdir -p $out/dtbs cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs '' else "") + (if isModular then '' @@ -190,6 +190,8 @@ let $installFlags "''${installFlagsArray[@]}" ''); + requiredSystemFeatures = [ "big-parallel" ]; + meta = { description = "The Linux kernel" +