buildLinux: allow overriding stdenv on each call

NixOS · Aug 20, 2017 · 7c7c83e · elitak · Aug 25, 2017 · vcunat
1 parent 0a4d102
commit 7c7c83e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
     }));