packages/linux-lava: don't use ccache by default
This commit is contained in:
parent
6eda948d6e
commit
4ce28a177c
3 changed files with 6 additions and 5 deletions
|
|
@ -80,6 +80,7 @@
|
|||
in
|
||||
{
|
||||
inherit (pkgs.me) linux-lava spotify-adblock;
|
||||
linux-lava-ccache = pkgs.me.linux-lava.override { useCcache = true; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,11 @@ self: super: let
|
|||
echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
};
|
||||
stdenv = super.ccacheStdenv.override {
|
||||
stdenv = super.overrideCC llvmPackages.stdenv cc;
|
||||
};
|
||||
stdenv = super.overrideCC llvmPackages.stdenv cc;
|
||||
ccacheStdenv = super.ccacheStdenv.override { inherit stdenv; };
|
||||
in {
|
||||
linuxLavaEnv = {
|
||||
inherit llvmPackages clangVersion cc stdenv;
|
||||
inherit llvmPackages clangVersion cc stdenv ccacheStdenv;
|
||||
};
|
||||
rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override {
|
||||
clang = cc;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, inputs
|
||||
, lib
|
||||
, linuxLavaEnv
|
||||
, useCcache ? false
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
|
|
@ -10,7 +11,7 @@ let
|
|||
sources = callPackage ./sources.nix { inherit inputs; };
|
||||
kernel = buildLinux (args // {
|
||||
inherit (sources) src kernelPatches;
|
||||
inherit (linuxLavaEnv) stdenv;
|
||||
stdenv = if useCcache then linuxLavaEnv.ccacheStdenv else linuxLavaEnv.stdenv;
|
||||
version = "${sources.version}-tkg-Lava";
|
||||
isZen = true;
|
||||
extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue