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 | |
parent | 0a4d102b98e2b503f2717588248a8730e87712ce (diff) | |
download | nixlib-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar nixlib-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.gz nixlib-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.bz2 nixlib-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.lz nixlib-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.xz nixlib-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.tar.zst nixlib-7c7c83e2335c3aa6f26a4f9c905c49c430b5be09.zip |
buildLinux: allow overriding stdenv on each call
-rw-r--r-- | nixos/modules/testing/minimal-kernel.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix index a463cb803ade..7c2b9c05cf9a 100644 --- a/nixos/modules/testing/minimal-kernel.nix +++ b/nixos/modules/testing/minimal-kernel.nix @@ -6,7 +6,7 @@ let ); origKernel = pkgs.buildLinux { - inherit (pkgs.linux) src version; + inherit (pkgs.linux) src version stdenv; inherit configfile; allowImportFromDerivation = true; kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ]; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index bbe867926927..379d3cad9705 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 70544ff92943..8227475f1b1a 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84db868ced3c..7e35bd052910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12281,7 +12281,7 @@ with pkgs; linuxPackages_custom = { version, src, configfile }: recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile; + inherit version src configfile stdenv; allowImportFromDerivation = true; })); |