b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

buildLinux: allow overriding stdenv on each call

Browse source
This commit is contained in:
Vladimír Čunát 2017-08-20 08:07:29 +02:00
parent 0a4d102b98
commit 7c7c83e233
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/testing/minimal-kernel.nix
View file

@ -6,7 +6,7 @@ let
); );
origKernel = pkgs.buildLinux { origKernel = pkgs.buildLinux {
inherit (pkgs.linux) src version; inherit (pkgs.linux) src version stdenv;
inherit configfile; inherit configfile;
allowImportFromDerivation = true; allowImportFromDerivation = true;
kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ]; kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];

2
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -103,7 +103,7 @@ let
}; };
kernel = buildLinux { kernel = buildLinux {
inherit version modDirVersion src kernelPatches; inherit version modDirVersion src kernelPatches stdenv;
configfile = configfile.nativeDrv or configfile; configfile = configfile.nativeDrv or configfile;

4
pkgs/os-specific/linux/kernel/manual-config.nix
View file

@ -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 , writeTextFile, ubootChooser
, hostPlatform , hostPlatform
}: }:
@ -14,6 +14,8 @@ let
echo "}" >> $out echo "}" >> $out
'').outPath; '').outPath;
in { in {
# Allow overriding stdenv on each buildLinux call
stdenv,
# The kernel version # The kernel version
version, version,
# The version of the kernel module directory # The version of the kernel module directory

2
pkgs/top-level/all-packages.nix
View file

@ -12281,7 +12281,7 @@ with pkgs;
linuxPackages_custom = { version, src, configfile }: linuxPackages_custom = { version, src, configfile }:
recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {
inherit version src configfile; inherit version src configfile stdenv;
allowImportFromDerivation = true; allowImportFromDerivation = true;
})); }));