From c5989b0173fa669297d1f92cee201cf77aa6c3eb Mon Sep 17 00:00:00 2001
From: "Jan B." <git@keksgesicht.net>
Date: Mon, 7 Oct 2024 20:47:24 +0200
Subject: [PATCH] tuxedo-drivers: update build commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: April John <aprl@acab.dev>
Co-Authored-By: Dominik Xaver Hörl <hoe.dom@gmx.de>

thanks to the work of:
- https://github.com/NixOS/nixpkgs/pull/293017
- https://github.com/NixOS/nixpkgs/pull/343483
---
 .../linux/tuxedo-drivers/default.nix          | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
index feef9de79b62f..fb9f62d4cf5ea 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitLab,
   kernel,
-  linuxHeaders,
+  kmod,
   pahole,
 }:
 
@@ -19,23 +19,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-wZUQHIkbxt9ckTFs8VTrA5I+ebBeaOm+Fb0+GqX5y0c=";
   };
 
-  buildInputs = [
-    pahole
-    linuxHeaders
-  ];
+  buildInputs = [ pahole ];
+  nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
 
-  makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/lib/modules/${kernel.modDirVersion}"
-
-    find src/ -type f -name '*.ko' \
-      -exec mv {} $out/lib/modules/${kernel.modDirVersion} \;
-
-    runHook postInstall
-  '';
+  # kernel makeFlags contain O=$$(buildRoot), that upstream passes through to make and causes build failure, so we filter it out here
+  makeFlags =
+    (lib.filter (flag: lib.head (lib.strings.splitString "=" flag) != "O") kernel.makeFlags)
+    ++ [
+      "KERNELRELEASE=${kernel.modDirVersion}"
+      "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+      "INSTALL_MOD_PATH=${placeholder "out"}"
+    ];
 
   meta = {
     broken = stdenv.hostPlatform.isAarch64 || (lib.versionOlder kernel.version "5.5");