Merge pull request #1197 from NixOS/lunar-lake

Mic92 · web-flow · commit 22e8de2729f4 · 2024-10-22T21:14:45.000+02:00
common/gpu/intel/lunar-lake: enable xe driver
diff --git a/common/cpu/intel/braswell/default.nix b/common/cpu/intel/braswell/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/braswell
   ];
 }
diff --git a/common/cpu/intel/broadwell/default.nix b/common/cpu/intel/broadwell/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/broadwell
   ];
 }
diff --git a/common/cpu/intel/comet-lake/default.nix b/common/cpu/intel/comet-lake/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/comet-lake
   ];
 }
diff --git a/common/cpu/intel/elkhart-lake/default.nix b/common/cpu/intel/elkhart-lake/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/elkhart-lake
   ];
 }
diff --git a/common/cpu/intel/haswell/default.nix b/common/cpu/intel/haswell/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/haswell
   ];
 }
diff --git a/common/cpu/intel/jasper-lake/default.nix b/common/cpu/intel/jasper-lake/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/jasper-lake
   ];
 }
diff --git a/common/cpu/intel/kaby-lake/default.nix b/common/cpu/intel/kaby-lake/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/kaby-lake
   ];
 }
diff --git a/common/cpu/intel/lunar-lake/cpu-only.nix b/common/cpu/intel/lunar-lake/cpu-only.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../cpu-only.nix
+  ];
+}
diff --git a/common/cpu/intel/lunar-lake/default.nix b/common/cpu/intel/lunar-lake/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./cpu-only.nix
+    ../../../gpu/intel/lunar-lake
+  ];
+}
diff --git a/common/cpu/intel/sandy-bridge/default.nix b/common/cpu/intel/sandy-bridge/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/sandy-bridge
   ];
 }
diff --git a/common/cpu/intel/tiger-lake/default.nix b/common/cpu/intel/tiger-lake/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../cpu-only.nix
+    ./cpu-only.nix
     ../../../gpu/intel/tiger-lake
   ];
 }
diff --git a/common/gpu/intel/lunar-lake/default.nix b/common/gpu/intel/lunar-lake/default.nix
@@ -0,0 +1,8 @@
+{ config, lib, ... }:
+{
+  imports = [ ../. ];
+  hardware.intelgpu = {
+    driver = lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8") "xe";
+    vaapiDriver = "intel-media-driver";
+  };
+}
diff --git a/tests/flake.lock b/tests/flake.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`imports = [`
`3`		`- ../cpu-only.nix`
	`3`	`+ ./cpu-only.nix`
`4`	`4`	`../../../gpu/intel/braswell`
`5`	`5`	`];`
`6`	`6`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  imports = [
 +    ../cpu-only.nix
 +  ];
 +}