Unverified Commit 7c7c83e2 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

buildLinux: allow overriding stdenv on each call

parent 0a4d102b

nixos/modules/testing/minimal-kernel.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

pkgs/os-specific/linux/kernel/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ let 
  };



  kernel = buildLinux {

    inherit version modDirVersion src kernelPatches;

    inherit version modDirVersion src kernelPatches stdenv;



    configfile = configfile.nativeDrv or configfile;

pkgs/os-specific/linux/kernel/manual-config.nix

+3 −1
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;















    }));