cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

packages/linux-lava: don't use ccache by default

Browse source
This commit is contained in:
LavaDesu 2025-03-18 00:09:46 +11:00
parent 6eda948d6e
commit 4ce28a177c
Signed by: cilly
GPG key ID: 6500251E087653C9
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -80,6 +80,7 @@
in in
{ {
inherit (pkgs.me) linux-lava spotify-adblock; inherit (pkgs.me) linux-lava spotify-adblock;
linux-lava-ccache = pkgs.me.linux-lava.override { useCcache = true; };
}; };
}; };
} }

7
overlays/linux-lava.nix
View file

@ -10,12 +10,11 @@ self: super: let
echo " -resource-dir=${llvmPackages.libclang.lib}/lib/clang/${clangVersion}" >> $out/nix-support/cc-cflags 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 { in {
linuxLavaEnv = { linuxLavaEnv = {
inherit llvmPackages clangVersion cc stdenv; inherit llvmPackages clangVersion cc stdenv ccacheStdenv;
}; };
rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override { rust-bindgen-unwrapped = super.rust-bindgen-unwrapped.override {
clang = cc; clang = cc;

3
packages/linux-lava/default.nix
View file

@ -3,6 +3,7 @@
, inputs , inputs
, lib , lib
, linuxLavaEnv , linuxLavaEnv
, useCcache ? false
, ... , ...
} @ args: } @ args:
@ -10,7 +11,7 @@ let
sources = callPackage ./sources.nix { inherit inputs; }; sources = callPackage ./sources.nix { inherit inputs; };
kernel = buildLinux (args // { kernel = buildLinux (args // {
inherit (sources) src kernelPatches; inherit (sources) src kernelPatches;
inherit (linuxLavaEnv) stdenv; stdenv = if useCcache then linuxLavaEnv.ccacheStdenv else linuxLavaEnv.stdenv;
version = "${sources.version}-tkg-Lava"; version = "${sources.version}-tkg-Lava";
isZen = true; isZen = true;
extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ]; extraMakeFlags = [ "LLVM=1" "LLVM_IAS=1" ];