From 7c7c83e2335c3aa6f26a4f9c905c49c430b5be09 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 20 Aug 2017 08:07:29 +0200 Subject: buildLinux: allow overriding stdenv on each call --- pkgs/os-specific/linux/kernel/generic.nix | 2 +- pkgs/os-specific/linux/kernel/manual-config.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') 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 -- cgit 1.4.1