pkgs/os-specific: stdenv.lib -> lib
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
, gmp ? null
|
||||
, libmpc ? null
|
||||
, mpfr ? null
|
||||
, lib
|
||||
, stdenv
|
||||
|
||||
, # The kernel source tarball.
|
||||
@@ -66,9 +67,6 @@
|
||||
assert stdenv.isLinux;
|
||||
|
||||
let
|
||||
|
||||
lib = stdenv.lib;
|
||||
|
||||
# Combine the `features' attribute sets of all the kernel patches.
|
||||
kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({
|
||||
iwlwifi = true;
|
||||
@@ -81,7 +79,7 @@ let
|
||||
} // features) kernelPatches;
|
||||
|
||||
commonStructuredConfig = import ./common-config.nix {
|
||||
inherit stdenv version ;
|
||||
inherit lib stdenv version;
|
||||
|
||||
features = kernelFeatures; # Ensure we know of all extra patches, etc.
|
||||
};
|
||||
@@ -113,7 +111,7 @@ let
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ perl gmp libmpc mpfr ]
|
||||
++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
|
||||
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ];
|
||||
|
||||
platformName = stdenv.hostPlatform.platform.name;
|
||||
# e.g. "defconfig"
|
||||
@@ -173,7 +171,7 @@ let
|
||||
}; # end of configfile derivation
|
||||
|
||||
kernel = (callPackage ./manual-config.nix {}) {
|
||||
inherit version modDirVersion src kernelPatches randstructSeed stdenv extraMeta configfile;
|
||||
inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile;
|
||||
|
||||
config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user