modules/overlays: Make overlay .nix files be plain overlay functions

Also restructure modules/overlays/default.nix to account for this; move all
overlay options into default.nix and load the overlay functions conditionally
from there.

1 files changed, 12 insertions, 24 deletions

diff --git a/modules/overlays/g45_h264.nix b/modules/overlays/g45_h264.nix
index 9df5ae1..b8e4513 100644
--- a/modules/overlays/g45_h264.nix
+++ b/modules/overlays/g45_h264.nix
@@ -1,25 +1,13 @@
-{ lib, config, pkgs, ... }:
-
-{
-  options = {
-    this.overlays.g45_h264.enable = lib.mkEnableOption "intel-vaapi-driver with h264 support on gm45";
-  };
-
-  config = lib.mkIf config.this.overlays.g45_h264.enable {
-    nixpkgs.overlays = [
-      (final: prev: {
-        intel-vaapi-driver =
-          prev.intel-vaapi-driver.overrideAttrs
-            (attrs: attrs // {
-              src = pkgs.fetchzip {
-                url = "https://bitbucket.org/alium/g45-h264/downloads/intel-driver-g45-h264-2.4.1.tar.gz";
-                sha256 = "h23mQV7WdtQjhkpUlnyHcwVTz+T3BZSuqfuKru4LClo=";
-                name = "intel-driver-g45-h264-2.4.1-source";
-              };
-              version = "2.4.1-g45-h264";
-              preBuild = "patchShebangs src";
-            });
-      })
-    ];
-  };
+final: prev: {
+  intel-vaapi-driver =
+    prev.intel-vaapi-driver.overrideAttrs
+      (attrs: attrs // {
+        src = final.fetchzip {
+          url = "https://bitbucket.org/alium/g45-h264/downloads/intel-driver-g45-h264-2.4.1.tar.gz";
+          sha256 = "h23mQV7WdtQjhkpUlnyHcwVTz+T3BZSuqfuKru4LClo=";
+          name = "intel-driver-g45-h264-2.4.1-source";
+        };
+        version = "2.4.1-g45-h264";
+        preBuild = "patchShebangs src";
+      });
 }