From b251520084787661f12dd976acf4314225d9fdc7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 30 Mar 2024 11:04:38 -0700
Subject: [PATCH 1/2] sunshine: use pkgs.autoAddDriverRunpath

---
 pkgs/servers/sunshine/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix
index a401f318a911..dc0503d8194d 100644
--- a/pkgs/servers/sunshine/default.nix
+++ b/pkgs/servers/sunshine/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, autoPatchelfHook
+, autoAddDriverRunpath
 , makeWrapper
 , buildNpmPackage
 , cmake
@@ -84,10 +84,11 @@ stdenv'.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    autoPatchelfHook
     makeWrapper
+    # Avoid fighting upstream's usage of vendored ffmpeg libraries
+    autoPatchelfHook
   ] ++ lib.optionals cudaSupport [
-    cudaPackages.autoAddDriverRunpath
+    autoAddDriverRunpath
   ];
 
   buildInputs = [

From 0df9f80d634b09b84de8b919dc82c16c2d7286b7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 31 Mar 2024 10:32:05 -0700
Subject: [PATCH 2/2] sunshine: Add comment about autoPatchelfHook's usage

---
 pkgs/servers/sunshine/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix
index dc0503d8194d..c5cad2a89166 100644
--- a/pkgs/servers/sunshine/default.nix
+++ b/pkgs/servers/sunshine/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, autoPatchelfHook
 , autoAddDriverRunpath
 , makeWrapper
 , buildNpmPackage