Unverified Commit f74bd2b0 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

gamescope: remove all-packages.nix override (#483747)

parents 4054ea2c d2975a9c

pkgs/by-name/ga/gamescope/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −9
Original line number Diff line number Diff line
@@ -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;