From ed0a0412bb8b263efdc5676d7dd982b002934399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 4 Aug 2023 01:31:28 -0300 Subject: [PATCH] steam: add temporary fix for switching generations --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + system/steam.nix | 13 ++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index d00a40d..061c7b9 100644 --- a/flake.lock +++ b/flake.lock @@ -598,6 +598,22 @@ "type": "github" } }, + "nixpkgs-fixed-steam": { + "locked": { + "lastModified": 1691123104, + "narHash": "sha256-5dx7Tj2EdVG0qn3O5CyNEvM8jo+w715CRDSCd5MFueU=", + "owner": "lelgenio", + "repo": "nixpkgs", + "rev": "335f50b1d2b8ea9812042f363242d6aa49e80aea", + "type": "github" + }, + "original": { + "owner": "lelgenio", + "ref": "test-steam-fix", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1673796341, @@ -691,6 +707,7 @@ "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", "nixpkgs": "nixpkgs_3", + "nixpkgs-fixed-steam": "nixpkgs-fixed-steam", "nur": "nur", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", diff --git a/flake.nix b/flake.nix index 5c6f4f0..99464ce 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,7 @@ url = "github:lelgenio/wl-crosshair"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-fixed-steam.url = "github:lelgenio/nixpkgs/test-steam-fix"; # gnome stuff nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor"; diff --git a/system/steam.nix b/system/steam.nix index 4aab11f..8ece86e 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -1,6 +1,12 @@ -{ config, pkgs, inputs, ... }: { +{ config, pkgs, inputs, ... }: +let + pkgs' = import inputs.nixpkgs-fixed-steam { + inherit (pkgs) system config; + }; +in +{ programs.steam.enable = true; - programs.steam.package = pkgs.steam.override { + programs.steam.package = pkgs'.steam.override { extraLibraries = pkgs: with config.hardware.opengl; if pkgs.hostPlatform.is64bit then [ package ] ++ extraPackages @@ -12,9 +18,6 @@ mangohud xdg-user-dirs ]; - extraProfile = '' - export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/" - ''; }; environment.systemPackages = with pkgs; [ protontricks