diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix | |
parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix')
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index ea4e041d43a0..cc3e039d2414 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -4,13 +4,10 @@ }: let - common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation { - name = "linux-headers-${version}"; + makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation { + inherit src; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - inherit sha256; - }; + name = "linux-headers-${version}"; ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or stdenvNoCC.hostPlatform.kernelArch; @@ -73,13 +70,18 @@ let }; }; in { + inherit makeLinuxHeaders; - linuxHeaders = common { - version = "4.19.16"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; - patches = [ - ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms - ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above - ]; - }; + linuxHeaders = let version = "4.19.16"; in + makeLinuxHeaders { + inherit version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + }; + patches = [ + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above + ]; + }; } |