diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-01 19:06:09 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-01 19:06:09 +0300 |
| commit | 6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d (patch) | |
| tree | 499aacffece8fdd65e983402758b927612d8bdaf /pkgs/os-specific | |
| parent | a1fc74b835f69e44d36d324e5e09a696107d73db (diff) | |
| parent | e94fcbcd01a7adc532d1081d3232e143efa422fe (diff) | |
| download | nixlib-6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d.tar nixlib-6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d.tar.gz nixlib-6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d.tar.bz2 nixlib-6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d.tar.lz nixlib-6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d.tar.xz nixlib-6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d.tar.zst nixlib-6260fc8b8ee24583f2d8c5c55a5d95983d88ef7d.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 6855c5c5f903..3fc08e642871 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.47-139"; + version = "4.14.55-146"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.47"; + modDirVersion = "4.14.55"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,19 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "0jjgrmvi1h8zs8snnvghnjd422yfmn7jv9y1n7xikmfv4nvwqrkv"; + sha256 = "1bm1njng4rwfylgnqv06vabkvybm9rikqj1lsb7p9qcs3y1kw6mh"; }; + defconfig = "odroidxu4_defconfig"; + + # This extraConfig is (only) required because the gator module fails to build as-is. + extraConfig = '' + + GATOR n + + # This attempted fix applies correctly but does not fix the build. + #GATOR_MALI_MIDGARD_PATH ${src}/drivers/gpu/arm/midgard + + '' + (args.extraConfig or ""); + } // (args.argsOverride or {})) |