From 511d90e325a21ddc1a3557a193abaa861aacabcc Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Wed, 29 Apr 2026 14:28:25 +0200
Subject: [PATCH 1/2] linuxPackages.nvidia_x11.persistenced: remove unnecessary
 dependencies

---
 .../linux/nvidia-x11/persistenced.nix            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 96cb8b08e1cc..3ec79049bd14 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -5,9 +5,9 @@ nvidia_x11: sha256:
   lib,
   fetchFromGitHub,
   m4,
-  glibc,
-  libtirpc,
   pkg-config,
+  addDriverRunpath,
+  libtirpc,
 }:
 
 stdenv.mkDerivation {
@@ -21,23 +21,22 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  env = {
-    LIBRARY_PATH = "${glibc}/lib";
+  env = lib.optionalAttrs (lib.versionOlder nvidia_x11.persistencedVersion "450.51") {
     NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
+    NIX_LDFLAGS = toString [ "-ltirpc" ];
   };
-  NIX_LDFLAGS = [ "-ltirpc" ];
 
   nativeBuildInputs = [
     m4
     pkg-config
+    addDriverRunpath
   ];
 
   buildInputs = [
     libtirpc
-    stdenv.cc.cc.lib
   ];
 
-  makeFlags = nvidia_x11.passthru.mod.makeFlags ++ [ "DATE=true" ];
+  makeFlags = [ "DATE=true" ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -47,8 +46,7 @@ stdenv.mkDerivation {
     cp $out/{bin,origBin}/nvidia-persistenced
     patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 $out/origBin/nvidia-persistenced
 
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \
-      $out/bin/nvidia-persistenced
+    addDriverRunpath $out/bin/nvidia-persistenced
   '';
 
   meta = {

From b3408269f841f66e998907a2de45c2d6e083bd53 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Wed, 29 Apr 2026 14:45:23 +0200
Subject: [PATCH 2/2] linuxPackages.nvidia_x11.persistenced: fix
 cross-compilation

---
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 3ec79049bd14..556e53f937af 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -4,6 +4,7 @@ nvidia_x11: sha256:
   stdenv,
   lib,
   fetchFromGitHub,
+  buildPackages,
   m4,
   pkg-config,
   addDriverRunpath,
@@ -26,6 +27,8 @@ stdenv.mkDerivation {
     NIX_LDFLAGS = toString [ "-ltirpc" ];
   };
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   nativeBuildInputs = [
     m4
     pkg-config
@@ -36,7 +39,12 @@ stdenv.mkDerivation {
     libtirpc
   ];
 
-  makeFlags = [ "DATE=true" ];
+  makeFlags = [
+    "DATE=true"
+    "DO_STRIP="
+    "HOST_CC=\$(CC_FOR_BUILD)"
+    "HOST_LD=\$(LD_FOR_BUILD)"
+  ];
 
   installFlags = [ "PREFIX=$(out)" ];