buildLinux: allow overriding stdenv on each call

Changed files
+6 -4
nixos
modules
pkgs
os-specific
top-level
+1 -1
nixos/modules/testing/minimal-kernel.nix
···
);
origKernel = pkgs.buildLinux {
-
inherit (pkgs.linux) src version;
inherit configfile;
allowImportFromDerivation = true;
kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];
···
);
origKernel = pkgs.buildLinux {
+
inherit (pkgs.linux) src version stdenv;
inherit configfile;
allowImportFromDerivation = true;
kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];
+1 -1
pkgs/os-specific/linux/kernel/generic.nix
···
};
kernel = buildLinux {
-
inherit version modDirVersion src kernelPatches;
configfile = configfile.nativeDrv or configfile;
···
};
kernel = buildLinux {
+
inherit version modDirVersion src kernelPatches stdenv;
configfile = configfile.nativeDrv or configfile;
+3 -1
pkgs/os-specific/linux/kernel/manual-config.nix
···
-
{ stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, writeTextFile, ubootChooser
, hostPlatform
}:
···
echo "}" >> $out
'').outPath;
in {
# The kernel version
version,
# The version of the kernel module directory
···
+
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, writeTextFile, ubootChooser
, hostPlatform
}:
···
echo "}" >> $out
'').outPath;
in {
+
# Allow overriding stdenv on each buildLinux call
+
stdenv,
# The kernel version
version,
# The version of the kernel module directory
+1 -1
pkgs/top-level/all-packages.nix
···
linuxPackages_custom = { version, src, configfile }:
recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {
-
inherit version src configfile;
allowImportFromDerivation = true;
}));
···
linuxPackages_custom = { version, src, configfile }:
recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {
+
inherit version src configfile stdenv;
allowImportFromDerivation = true;
}));