public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
John Ericson
2018-09-18 16:55:42 -04:00
parent ce6e72a11c 35378f0141
commit 7319013ea1
850 changed files with 49899 additions and 16989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@@ -2,8 +2,6 @@
, fetchurl, perl
}:
assert stdenvNoCC.hostPlatform.isLinux;
let
common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {
name = "linux-headers-${version}";
@@ -13,7 +11,7 @@ let
inherit sha256;
};
ARCH = stdenvNoCC.hostPlatform.platform.kernelArch;
ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or (throw "missing kernelArch");
# It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
# We do this so we have a build->build, not build->host, C compiler.