hosts/arael: kernel patch for GPL kernel_neon_ APIs

https://github.com/jakubgs/nixos-nanopi-r6c/issues/1 Mic92/nixpkgs@fb89d2b openzfs/zfs#14555 Signed-off-by: Jakub Sokołowski <[email protected]>
jakubgs · Aug 23, 2023 · ec3c2b5 · ec3c2b5
1 parent 8460f80
commit ec3c2b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/hosts/arael/kernel_vanilla_6_3.nix b/hosts/arael/kernel_vanilla_6_3.nix
@@ -17,5 +17,7 @@ buildLinux (args // rec {
   kernelPatches = [
     { name = "nanopi_r6s_rk3588s";
       patch = ./nanopi_r6s_rk3588s.patch; }
+    { name = "export_neon_symbols_as_gpl";
+      patch = ./export_neon_symbols_as_gpl.patch; }
   ];
 } // (args.argsOverride or { }))
diff --git a/hosts/arael/sd-image.nix b/hosts/arael/sd-image.nix
@@ -39,11 +39,6 @@ in {
   services.sshd.enable = true;
   networking.firewall.enable = false;
 
-  # ZFS "GPL-incompatible module" fix:
-  # https://github.com/NixOS/nixpkgs/pull/237875
-  # https://github.com/openzfs/zfs/issues/14555
-  boot.zfs.removeLinuxDRM = true;
-
   # root autologin etc
   users.users.root.password = "root";
   services.openssh.settings.PermitRootLogin = lib.mkDefault "yes";