nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-4.3: Fix build failure.

Browse Source 
The package has been cherry-picked into the 15.09 release at 9bae8f6,
unfortunately without the fixes that were introduced by the upgrades in
linux-testing.

As it is now the current "_latest" in 15.09, we really don't want the
build to fail.

This is a partial cherry-pick from 9fbbbd5 because that commit was
updating linux-testing as well.

Tested with the latestKernel.login VM test.

Signed-off-by: William A. Kennington III <william@wkennington.com>
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
William A. Kennington III
2015-09-21 12:42:00 -07:00
committed by aszlig
parent f6b3ca11ab
commit b77502cea2
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,9 @@ with stdenv.lib;
# Video configuration.
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
${optionalString (versionOlder version "4.3") ''
DRM_I915_KMS y
''}
# Allow specifying custom EDID on the kernel command line
DRM_LOAD_EDID_FIRMWARE y
${optionalString (versionOlder version "3.9") ''
@@ -327,6 +329,7 @@ with stdenv.lib;
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
HWMON y
THERMAL_HWMON y # Hardware monitoring support
${optionalString (versionAtLeast version "3.15") ''
UEVENT_HELPER n

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

@@ -1,4 +1,4 @@
{ stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile, ubootChooser }:
{ stdenv, runCommand, nettools, bc, perl, kmod, openssl, writeTextFile, ubootChooser }:
let
readConfig = configfile: import (runCommand "config.nix" {} ''
@@ -221,7 +221,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
enableParallelBuilding = true;
nativeBuildInputs = [ perl bc nettools ] ++ optional (stdenv.platform.uboot != null)
nativeBuildInputs = [ perl bc nettools openssl ] ++ optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot);
makeFlags = commonMakeFlags ++ [

2
pkgs/top-level/all-packages.nix
View File

@@ -10024,7 +10024,7 @@ let
# A function to build a manually-configured kernel
linuxManualConfig = pkgs.buildLinux;
buildLinux = import ../os-specific/linux/kernel/manual-config.nix {
inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser openssl;
};
keyutils = callPackage ../os-specific/linux/keyutils { };