nfs4 patch: fix so moby can still build
This commit is contained in:
parent
6d7ff7ea86
commit
a2f4dc0b6c
|
@ -20,7 +20,7 @@
|
|||
# this fixes /mnt/servo-nfs mount failures
|
||||
# <https://github.com/NixOS/nixpkgs/issues/255803>
|
||||
boot.kernelPatches = [{
|
||||
name = "nfs4-patch";
|
||||
name = "backport-nfs4-selinux-fix";
|
||||
patch = pkgs.fetchpatch {
|
||||
url = "https://patchwork.kernel.org/project/selinux/patch/20230911142358.883728-1-omosnace@redhat.com/raw/";
|
||||
hash = "sha256-m947t39xr4VqJBZ2mYTFq9Up/NWlwueH8aXFZRQwA7c=";
|
||||
|
|
|
@ -184,7 +184,13 @@ in buildLinux (args // {
|
|||
inherit rev hash;
|
||||
};
|
||||
|
||||
kernelPatches = (args.kernelPatches or []) ++ extraKernelPatches;
|
||||
kernelPatches = extraKernelPatches ++ (
|
||||
# this patch only applies to nixpkgs kernel (and is probably not necessary on megi's).
|
||||
# TODO: remove the patch and this logic here once fixed in nixpkgs: <https://github.com/NixOS/nixpkgs/issues/255803>
|
||||
lib.filter
|
||||
(p: p.name != "backport-nfs4-selinux-fix")
|
||||
(args.kernelPatches or [])
|
||||
);
|
||||
|
||||
structuredExtraConfig = (args.structuredExtraConfig or {}) // kernelConfig;
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue
Block a user