diff --git a/hosts/common/hardware/default.nix b/hosts/common/hardware/default.nix index 85c248ea4..721cbfbd2 100644 --- a/hosts/common/hardware/default.nix +++ b/hosts/common/hardware/default.nix @@ -20,7 +20,7 @@ # this fixes /mnt/servo-nfs mount failures # 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="; diff --git a/pkgs/additional/linux-megous/default.nix b/pkgs/additional/linux-megous/default.nix index 7da8f56e9..1b0409c8f 100644 --- a/pkgs/additional/linux-megous/default.nix +++ b/pkgs/additional/linux-megous/default.nix @@ -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: + lib.filter + (p: p.name != "backport-nfs4-selinux-fix") + (args.kernelPatches or []) + ); structuredExtraConfig = (args.structuredExtraConfig or {}) // kernelConfig; })