diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 682b71e2b338c..7224f1591a3d1 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -29,7 +29,7 @@ glslang, hwdata, stb, - wlroots, + wlroots_0_17, libdecor, lcms, lib, @@ -37,7 +37,7 @@ makeBinaryWrapper, nix-update-script, enableExecutable ? true, - enableWsi ? true, + enableWsi ? false, }: let frogShaders = fetchFromGitHub { @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers ] ++ lib.optionals enableExecutable ( - wlroots.buildInputs + wlroots_0_17.buildInputs ++ [ # gamescope uses a custom wlroots branch xorg.libXcomposite diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55dc098103379..e343386853f8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1000,18 +1000,9 @@ with pkgs; libgamemode32 = pkgsi686Linux.gamemode.lib; }; - gamescope = callPackage ../by-name/ga/gamescope/package.nix { - enableExecutable = true; - enableWsi = false; - - wlroots = wlroots_0_17; - }; - gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix { enableExecutable = false; enableWsi = true; - - wlroots = wlroots_0_17; }; font-v = with python3Packages; toPythonApplication font-v;