notgne2/nixfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Substitute wineWow for wine64, and make Steam optional, both to circumvent build issues with Steam upstream

Browse Source
This commit is contained in:
notgne2 2021-04-07 13:42:29 -07:00
parent b13796a5a2
commit d3af57b733
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/ezpc.nix
View File

@ -84,23 +84,26 @@ let
steam-run = steam.run; 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; }; newwinetricks = pkgs.winetricks.override { wine = newwine; };
oldwine = (pkgs.wineFull.override { wineBuild = "wineWow"; }); oldwine = (pkgs.wineFull.override { wineBuild = "wine64"; });
oldwinetricks = pkgs.winetricks.override { wine = oldwine; }; oldwinetricks = pkgs.winetricks.override { wine = oldwine; };
in in
with pkgs; ([ with pkgs; ([
steam
steam-run
xlibs.xf86inputjoystick xlibs.xf86inputjoystick
oldwine oldwine
oldwinetricks oldwinetricks
] ++ (if !cfg.flatSteam then [
steam
steam-run
(writeScriptBin "steam-run-native" '' (writeScriptBin "steam-run-native" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
${(steam.override { nativeOnly = true; }).run}/bin/steam-run $@ ${(steam.override { nativeOnly = true; }).run}/bin/steam-run $@
'') '')
] ++ ( ] else [
# steam-run-native
]) ++ (
if cfg.newWine then [ if cfg.newWine then [
( (
pkgs.runCommand "new-wine-stuff" pkgs.runCommand "new-wine-stuff"
@ -142,6 +145,12 @@ in
description = "If this PC is used for gaming"; 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 { touchscreen = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;