From 9486d5ee384e6eb10273fdb500ad96cd66ecf533 Mon Sep 17 00:00:00 2001
From: Atlas Yu <pseudoc@163.com>
Date: Wed, 3 Sep 2025 23:08:48 +0800
Subject: [PATCH] intel-npu-driver: apply suggestions

---
 nixos/modules/hardware/cpu/intel-npu.nix     | 17 ++++++++---------
 pkgs/by-name/in/intel-npu-driver/package.nix |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/hardware/cpu/intel-npu.nix b/nixos/modules/hardware/cpu/intel-npu.nix
index 0bd406e6892f..a384708e3544 100644
--- a/nixos/modules/hardware/cpu/intel-npu.nix
+++ b/nixos/modules/hardware/cpu/intel-npu.nix
@@ -15,18 +15,17 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = config.hardware.graphics.enable;
-        message = "Intel NPU requires hardware.graphics.enable to be enabled";
-      }
-    ];
-
-    hardware.firmware = [ pkgs.intel-npu-driver.firmware ];
-    hardware.graphics.extraPackages = [ pkgs.intel-npu-driver ];
     environment.systemPackages = [
       pkgs.intel-npu-driver.validation
       pkgs.level-zero
     ];
+
+    hardware = {
+      firmware = [ pkgs.intel-npu-driver.firmware ];
+      graphics = {
+        enable = true;
+        extraPackages = [ pkgs.intel-npu-driver ];
+      };
+    };
   };
 }
diff --git a/pkgs/by-name/in/intel-npu-driver/package.nix b/pkgs/by-name/in/intel-npu-driver/package.nix
index 7cf9e28d0942..70c079eb73fe 100644
--- a/pkgs/by-name/in/intel-npu-driver/package.nix
+++ b/pkgs/by-name/in/intel-npu-driver/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "linux-npu-driver";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Lc+FsW0bM2cIqEXpCd9+nvFh70xCbY6aMSHZIjESxhs=";
   };