From d3af57b733c018154e13fffb990258de671e9770 Mon Sep 17 00:00:00 2001
From: notgne2 <gen2@gen2.space>
Date: Wed, 7 Apr 2021 13:42:29 -0700
Subject: [PATCH] Substitute wineWow for wine64, and make Steam optional, both
 to circumvent build issues with Steam upstream

---
 modules/ezpc.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/ezpc.nix b/modules/ezpc.nix
index 6a3d0a6..76e4770 100644
--- a/modules/ezpc.nix
+++ b/modules/ezpc.nix
@@ -84,23 +84,26 @@ let
 
         steam-run = steam.run;
 
-        newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
+        newwine = (pkgs.wineFull.override { wineBuild = "wine64"; wineRelease = "staging"; });
         newwinetricks = pkgs.winetricks.override { wine = newwine; };
 
-        oldwine = (pkgs.wineFull.override { wineBuild = "wineWow"; });
+        oldwine = (pkgs.wineFull.override { wineBuild = "wine64"; });
         oldwinetricks = pkgs.winetricks.override { wine = oldwine; };
       in
       with pkgs; ([
-        steam
-        steam-run
         xlibs.xf86inputjoystick
         oldwine
         oldwinetricks
+      ] ++ (if !cfg.flatSteam then [
+        steam
+        steam-run
         (writeScriptBin "steam-run-native" ''
           #!${pkgs.stdenv.shell}
           ${(steam.override { nativeOnly = true; }).run}/bin/steam-run $@
         '')
-      ] ++ (
+      ] else [
+        # steam-run-native
+      ]) ++ (
         if cfg.newWine then [
           (
             pkgs.runCommand "new-wine-stuff"
@@ -142,6 +145,12 @@ in
       description = "If this PC is used for gaming";
     };
 
+    flatSteam = mkOption {
+      type = types.bool;
+      default = false;
+      description = "If you use the flatpak Steam instead of NixOS";
+    };
+
     touchscreen = mkOption {
       type = types.bool;
       default = false;