diff --git a/flake.lock b/flake.lock index 1eccf3d..0c1e862 100644 --- a/flake.lock +++ b/flake.lock @@ -422,6 +422,22 @@ "type": "github" } }, + "nixpkgs-fix-steam-generation-switching": { + "locked": { + "lastModified": 1666673293, + "narHash": "sha256-VpXToWKG743S+dxes6PZ5GbKGV8qTZ+Npmyg1vqGOX4=", + "owner": "zhaofengli", + "repo": "nixpkgs", + "rev": "98773c9c5ef62c578ce22bac5d245401430e55db", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "bwrap-fhs-preserve-etc-symlink", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -590,6 +606,7 @@ "nil-lsp": "nil-lsp", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", + "nixpkgs-fix-steam-generation-switching": "nixpkgs-fix-steam-generation-switching", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "plymouth-themes": "plymouth-themes", diff --git a/flake.nix b/flake.nix index 52df737..b06bf2b 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,8 @@ sea-orm-cli.url = "github:lucperkins/nixpkgs/lperkins/sea-orm-cli"; webcord.url = "github:huantianad/nixpkgs/webcord"; + nixpkgs-fix-steam-generation-switching.url = "github:zhaofengli/nixpkgs/bwrap-fhs-preserve-etc-symlink"; + nil-lsp.url = "github:oxalica/nil"; nil-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/overlays/default.nix b/overlays/default.nix index 9d626ad..8fc9356 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,6 +18,10 @@ unstable = (final: prev: { unstable = inputs.nixpkgs-unstable.legacyPackages.${prev.system}; + nixpkgs-fix-steam-generation-switching = import inputs.nixpkgs-fix-steam-generation-switching { + config = { allowUnfree = true; }; + inherit system; + }; }); sixel-patches = (import ./sixel-patches.nix (inputs)); @@ -60,7 +64,7 @@ patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; }); - steam = prev.steam.override { + steam = final.nixpkgs-fix-steam-generation-switching.steam.override { extraPkgs = pkgs: with pkgs; [ capitaine-cursors bibata-cursors ]; }; });