Username404-59/nix-cachyos-kernel
1
0
Fork 0
mirror of https://github.com/xddxdd/nix-cachyos-kernel.git synced 2026-07-03 11:08:07 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove the now unnecessary kernel module override

Browse Source
This commit is contained in:
Lan Tian 2026-05-09 16:34:22 -07:00
parent 8adff7983c
commit eaacd115fa
No known key found for this signature in database
GPG Key ID: 04E66B6B25A0862B
3 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -365,16 +365,6 @@ Additional arguments are passed through to `buildLinux` from nixpkgs. See [nixpk
# Additional args are available. See kernel-cachyos/mkCachyKernel.nix # Additional args are available. See kernel-cachyos/mkCachyKernel.nix
}; };
# For non-LTO kernels
kernelPackages = pkgs.linuxKernel.packagesFor kernel; kernelPackages = pkgs.linuxKernel.packagesFor kernel;
# For LTO kernels, helpers.kernelModuleLLVMOverride fixes compilation for some
# out-of-tree modules in nixpkgs.
kernelPackagesWithLTOFix = let
# helpers.nix provides a few utilities for building kernel with LTO.
# I haven't figured out a clean way to expose it in flakes.
helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel.outPath}/helpers.nix" {};
in helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel);
} }
``` ```

25
helpers.nix
View File

@ -55,29 +55,4 @@ rec {
pkgs.patchelf pkgs.patchelf
]; ];
}); });
kernelModuleLLVMOverride =
kernelPackages_:
kernelPackages_.extend (
_final: prev:
lib.mapAttrs (
n: v:
if
builtins.elem "LLVM=1" kernelPackages_.kernel.commonMakeFlags
&& !(builtins.elem n [ "kernel" ])
&& lib.isDerivation v
&& ((v.overrideAttrs or null) != null)
then
v.overrideAttrs (old: {
makeFlags = (old.makeFlags or [ ]) ++ kernelPackages_.kernel.commonMakeFlags;
postPatch = (if (old.postPatch or null) == null then "" else old.postPatch) + ''
if [ -f Makefile ]; then
substituteInPlace Makefile --replace "gcc" "cc"
fi
'';
})
else
v
) prev
);
} }

7
kernel-cachyos/packages.nix
View File

@ -6,16 +6,12 @@
... ...
}: }:
let let
helpers = callPackage ../helpers.nix { };
inherit (helpers) kernelModuleLLVMOverride;
kernels = lib.filterAttrs (_: lib.isDerivation) (callPackage ./. { inherit inputs; }); kernels = lib.filterAttrs (_: lib.isDerivation) (callPackage ./. { inherit inputs; });
in in
lib.mapAttrs' ( lib.mapAttrs' (
n: v: n: v:
let let
packages = kernelModuleLLVMOverride ( packages = (linuxKernel.packagesFor v).extend (
(linuxKernel.packagesFor v).extend (
final: prev: final: prev:
let let
variant = lib.removePrefix "linux-cachyos-" v.cachyosConfigVariant; variant = lib.removePrefix "linux-cachyos-" v.cachyosConfigVariant;
@ -25,7 +21,6 @@ lib.mapAttrs' (
inherit inputs variant; inherit inputs variant;
}; };
} }
)
); );
in in
lib.nameValuePair "linuxPackages-${lib.removePrefix "linux-" n}" packages lib.nameValuePair "linuxPackages-${lib.removePrefix "linux-" n}" packages