From 5366c0e01d22ba26f15ad12ee22cc10cf65440d2 Mon Sep 17 00:00:00 2001
From: shibahaczix <shibahaczix@gmail.com>
Date: Mon, 20 Apr 2026 19:47:44 +0200
Subject: [PATCH 1/3] Fixed clang compatibility

---
 nix/package.nix | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/nix/package.nix b/nix/package.nix
index 598fffd..43b02c5 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -2,7 +2,6 @@
 pkgs @ {
   lib,
   bash,
-  stdenv,
   coreutils,
   writeShellScript,
   makeDesktopItem,
@@ -12,6 +11,7 @@ pkgs @ {
 }:
 
 let
+  stdenv = pkgs.llvmPackages_21.stdenv;
   mkPackage = overrides @ {
     kernel,
     ...
@@ -29,18 +29,29 @@ let
       makeWrapper
       autoPatchelfHook
       copyDesktopItems
+      llvmPackages_21.clang-unwrapped
+      llvmPackages_21.lld
+      llvmPackages_21.llvm
     ];
     buildInputs = [
       stdenv.cc.cc.lib
       pkgs.glfw3
     ];
 
-    makeFlags = kernelModuleMakeFlags ++ [
-      "KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-      "-C"
-      "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-      "M=$(sourceRoot)/driver"
-    ];
+      makeFlags = [
+        "LLVM=1"
+        "LLVM_IAS=1"
+
+        "CC=${pkgs.llvmPackages_21.clang-unwrapped}/bin/clang"
+        "HOSTCC=${pkgs.llvmPackages_21.clang-unwrapped}/bin/clang"
+
+        "LD=ld.lld"
+        "HOSTLD=ld.lld"
+
+        "-C"
+        "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+        "M=$(sourceRoot)/driver"
+      ];
 
     LD_LIBRARY_PATH = "/run/opengl-driver/lib:${lib.makeLibraryPath buildInputs}";
 

From d2f52632e7b7f5cfcf16a1b741c1215363e4f92c Mon Sep 17 00:00:00 2001
From: shibahaczix <shibahaczix@gmail.com>
Date: Mon, 20 Apr 2026 19:51:18 +0200
Subject: [PATCH 2/3] stdenv.cc.cc.lib -> pkgs.stdenv.cc.cc

---
 nix/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/package.nix b/nix/package.nix
index 43b02c5..af0a42d 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -34,7 +34,7 @@ let
       llvmPackages_21.llvm
     ];
     buildInputs = [
-      stdenv.cc.cc.lib
+      pkgs.stdenv.cc.cc
       pkgs.glfw3
     ];
 

From 1763a26e47e6358dfd23a9cd378722a1d4c56a3a Mon Sep 17 00:00:00 2001
From: shibahaczix <shibahaczix@gmail.com>
Date: Mon, 20 Apr 2026 19:54:54 +0200
Subject: [PATCH 3/3] Added CC and CXX to postBuild

---
 nix/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nix/package.nix b/nix/package.nix
index af0a42d..7bcb31a 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -55,10 +55,13 @@ let
 
     LD_LIBRARY_PATH = "/run/opengl-driver/lib:${lib.makeLibraryPath buildInputs}";
 
+
     postBuild = ''
-      make "-j$NIX_BUILD_CORES" -C $sourceRoot/gui "M=$sourceRoot/gui" \
-        "LIBS=-lglfw -lGL" \
-        "CXXFLAGS=-Wno-sign-compare -Wno-unused-function -Wno-return-type -isystem $sourceRoot/gui/External"
+      make -j$NIX_BUILD_CORES -C $sourceRoot/gui \
+        CC=${pkgs.stdenv.cc}/bin/cc \
+        CXX=${pkgs.stdenv.cc}/bin/c++ \
+        LIBS="-lglfw -lGL" \
+        CXXFLAGS="-std=c++17 -isystem $sourceRoot/gui/External"
     '';
 
     postInstall = let