From d2975a9cc0e356f6e76a710ee30f70c400de2b6c Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:05:05 +0200 Subject: [PATCH] gamescope: remove top-level override --- pkgs/by-name/ga/gamescope/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 2453a491ad79..7224f1591a3d 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, @@ -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 7ffbbb9ccf7f..e343386853f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1000,15 +1000,9 @@ with pkgs; libgamemode32 = pkgsi686Linux.gamemode.lib; }; - gamescope = callPackage ../by-name/ga/gamescope/package.nix { - 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;