From 791ee7f0731909a8f9398ae4e77c216ca158b9df Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 9 Aug 2025 08:54:26 +1200
Subject: [PATCH 1/2] heroic: disable privateTmp

Disable privateTmp in the Steam runtime env wrapper so that Heroic does
not run multiple instances.

Closes #432037
---
 pkgs/by-name/he/heroic/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/heroic/package.nix b/pkgs/by-name/he/heroic/package.nix
index 77dc9a494db8..d68acae65911 100644
--- a/pkgs/by-name/he/heroic/package.nix
+++ b/pkgs/by-name/he/heroic/package.nix
@@ -5,7 +5,7 @@
   extraLibraries ? pkgs: [ ],
 }:
 
-steam.buildRuntimeEnv {
+(steam.override { privateTmp = false; }).buildRuntimeEnv {
   pname = "heroic";
   inherit (heroic-unwrapped) version meta;
 

From cb55cd0848f11424ef6042551efa482fe5038873 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 9 Aug 2025 08:52:10 +0300
Subject: [PATCH 2/2] steam.buildRuntimeEnv: plumb privateTmp

---
 pkgs/by-name/he/heroic/package.nix | 4 +++-
 pkgs/by-name/st/steam/package.nix  | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/heroic/package.nix b/pkgs/by-name/he/heroic/package.nix
index d68acae65911..4884a733ecd1 100644
--- a/pkgs/by-name/he/heroic/package.nix
+++ b/pkgs/by-name/he/heroic/package.nix
@@ -5,7 +5,7 @@
   extraLibraries ? pkgs: [ ],
 }:
 
-(steam.override { privateTmp = false; }).buildRuntimeEnv {
+steam.buildRuntimeEnv {
   pname = "heroic";
   inherit (heroic-unwrapped) version meta;
 
@@ -19,4 +19,6 @@
     ln -s ${heroic-unwrapped}/share/applications $out/share
     ln -s ${heroic-unwrapped}/share/icons $out/share
   '';
+
+  privateTmp = false;
 }
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index 06c08f7490ef..99b28d32bb68 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -21,6 +21,7 @@ let
       extraPreBwrapCmds ? "",
       extraBwrapArgs ? [ ],
       extraEnv ? { },
+      privateTmp ? true,
       ...
     }@args:
     buildFHSEnv (
@@ -150,6 +151,7 @@ buildRuntimeEnv {
     extraPreBwrapCmds
     extraBwrapArgs
     extraEnv
+    privateTmp
     ;
 
   runScript = writeShellScript "steam-wrapped" ''
@@ -175,6 +177,7 @@ buildRuntimeEnv {
             extraPreBwrapCmds
             extraBwrapArgs
             extraEnv
+            privateTmp
             ;
 
           runScript = writeShellScript "steam-run" ''