From 41dbb7be26b5c8bfb5db3a38abddeb0139e54b0b Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Tue, 8 Nov 2022 08:54:24 +1300
Subject: [PATCH 1/3] heroic: Add extra Wine dependencies

Add optional Wine dependencies following a guide that is strongly recommended by
upstream: https://github.com/lutris/docs/blob/master/WineDependencies.md
---
 pkgs/games/heroic/fhsenv.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix
index 75012f405f81..9e4f11d0d6b4 100644
--- a/pkgs/games/heroic/fhsenv.nix
+++ b/pkgs/games/heroic/fhsenv.nix
@@ -49,21 +49,26 @@ buildFHSUserEnv {
     ];
   in pkgs: with pkgs; [
     alsa-lib
+    alsa-plugins
     bash
     cairo
     coreutils
     cups
     dbus
+    freealut
     freetype
     fribidi
     giflib
     glib
     gnutls
+    gst_all_1.gst-plugins-base
     gtk3
     lcms2
     libevdev
+    libgcrypt
     libGLU
     libglvnd
+    libgpg-error
     libjpeg
     libkrb5
     libmpeg2
@@ -83,16 +88,19 @@ buildFHSUserEnv {
     libxkbcommon
     libxml2
     mpg123
+    ncurses
     ocl-icd
     openldap
     pipewire
     samba4
     sane-backends
     SDL2
+    sqlite
     udev
     udev
     unixODBC
     util-linux
+    v4l-utils
     vulkan-loader
     wayland
     zlib

From 19bae515ba694ef334cd320d403e6bfa487f4f09 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sun, 13 Nov 2022 09:03:32 +1300
Subject: [PATCH 2/3] heroic: Add Feral Interactive GameMode to Heroic FHS
 environment

The Heroic Games Launcher has built-in support for running games with GameMode.
This change makes the client executable available in the Heroic FHS environment,
but the NixOS module will need to be enabled on the host system.
---
 pkgs/games/heroic/fhsenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix
index 9e4f11d0d6b4..3f1a2a9b6007 100644
--- a/pkgs/games/heroic/fhsenv.nix
+++ b/pkgs/games/heroic/fhsenv.nix
@@ -12,6 +12,7 @@ buildFHSUserEnv {
 
   targetPkgs = pkgs: with pkgs; [
     heroic-unwrapped
+    gamemode
     curl
     gawk
     gnome.zenity

From 2528455a41c6f1a72ac75b3c6879879e5788bd2a Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 14 Nov 2022 09:01:38 +1300
Subject: [PATCH 3/3] heroic: Add cabextract for winetricks hacks

Some winetricks hacks need to extract .cab files, which requires the external
tool cabextract.
---
 pkgs/games/heroic/fhsenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix
index 3f1a2a9b6007..d3625ad129b6 100644
--- a/pkgs/games/heroic/fhsenv.nix
+++ b/pkgs/games/heroic/fhsenv.nix
@@ -52,6 +52,7 @@ buildFHSUserEnv {
     alsa-lib
     alsa-plugins
     bash
+    cabextract
     cairo
     coreutils
     cups