From 3f94560d867213e66db219417d906e4790387823 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 27 Jul 2025 12:27:19 +0300
Subject: [PATCH] umu-launcher: use steam.buildRuntimeEnv

---
 pkgs/by-name/um/umu-launcher/package.nix | 31 ++++++------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/um/umu-launcher/package.nix b/pkgs/by-name/um/umu-launcher/package.nix
index 8c1c23d66d8e..6fcdd81b0036 100644
--- a/pkgs/by-name/um/umu-launcher/package.nix
+++ b/pkgs/by-name/um/umu-launcher/package.nix
@@ -1,5 +1,4 @@
 {
-  buildFHSEnv,
   lib,
   steam,
   umu-launcher-unwrapped,
@@ -7,27 +6,17 @@
   extraLibraries ? pkgs: [ ],
   extraProfile ? "", # string to append to shell profile
   extraEnv ? { }, # Environment variables to include in shell profile
-  withMultiArch ? true, # Many Wine games need 32-bit libraries.
 }:
-let
-  # Steam is not a dependency, but we re-use some of its implementation
-  steam' = steam.override {
-    inherit extraEnv extraProfile;
-  };
-in
-buildFHSEnv {
+steam.buildRuntimeEnv {
   pname = "umu-launcher";
   inherit (umu-launcher-unwrapped) version meta;
 
-  targetPkgs =
-    pkgs:
-    [
-      # Use umu-launcher-unwrapped from the package args, to support overriding
-      umu-launcher-unwrapped
-    ]
-    ++ extraPkgs pkgs;
-  multiPkgs = extraLibraries;
-  multiArch = withMultiArch;
+  extraPkgs = pkgs: [ umu-launcher-unwrapped ] ++ extraPkgs pkgs;
+  inherit
+    extraLibraries
+    extraProfile
+    extraEnv
+    ;
 
   executableName = umu-launcher-unwrapped.meta.mainProgram;
   runScript = lib.getExe umu-launcher-unwrapped;
@@ -41,10 +30,4 @@ buildFHSEnv {
     ln -s ${umu-launcher-unwrapped}/lib $out/lib
     ln -s ${umu-launcher-unwrapped}/share $out/share
   '';
-
-  # For umu & proton, we need roughly the same environment as Steam.
-  # For simplicity, we use Steam's `profile` implementation.
-  # See https://github.com/NixOS/nixpkgs/pull/381047
-  # And https://github.com/NixOS/nixpkgs/issues/297662#issuecomment-2647656699
-  inherit (steam'.args) profile;
 }