diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 08:07:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 08:24:52 +0200 |
| commit | 7c7c83e2335c3aa6f26a4f9c905c49c430b5be09 (patch) | |
| tree | 65c15f87d302f28b8f23c0bd8ecdc3538e3f6715 /pkgs/os-specific | |
| parent | 0a4d102b98e2b503f2717588248a8730e87712ce (diff) | |
| download | nixpkgs-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar nixpkgs-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.gz nixpkgs-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.bz2 nixpkgs-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.lz nixpkgs-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.xz nixpkgs-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.zst nixpkgs-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.zip | |
buildLinux: allow overriding stdenv on each call
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index bbe86792692..379d3cad970 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -103,7 +103,7 @@ let }; kernel = buildLinux { - inherit version modDirVersion src kernelPatches; + inherit version modDirVersion src kernelPatches stdenv; configfile = configfile.nativeDrv or configfile; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 70544ff9294..8227475f1b1 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl +{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl , writeTextFile, ubootChooser , hostPlatform }: @@ -14,6 +14,8 @@ let echo "}" >> $out '').outPath; in { + # Allow overriding stdenv on each buildLinux call + stdenv, # The kernel version version, # The version of the kernel module directory |