Unverified Commit 711f2388 authored by Sefa Eyeoglu's avatar Sefa Eyeoglu
Browse files

gamescope: 3.11.52-beta6 -> 3.12.0-beta9 

glm was added as a dependency in 3.12.0-beta1.[[0]]
gbenchmark was added as a dependency in 3.12.0-beta4.[[1]]

The patches that were previously needed for 3.11.52-beta6 were merged
upstream.[[2]][[3]][[4]][[5]]

[0]: https://github.com/ValveSoftware/gamescope/pull/849
[1]: https://github.com/ValveSoftware/gamescope/pull/872
[2]: https://github.com/ValveSoftware/gamescope/pull/811
[3]: https://github.com/ValveSoftware/gamescope/pull/813
[4]: https://github.com/ValveSoftware/gamescope/pull/812
[5]: https://github.com/ValveSoftware/gamescope/pull/824



Signed-off-by: default avatarSefa Eyeoglu <contact@scrumplex.net>
parent 3d46347a

pkgs/applications/window-managers/gamescope/default.nix

+7 −29
Original line number Diff line number Diff line 
{ stdenv

, fetchFromGitHub

, fetchpatch

, meson

, pkg-config

, ninja
@@ -11,6 +10,8 @@ 
, wayland

, wayland-protocols

, libxkbcommon

, glm

, gbenchmark

, libcap

, SDL2

, pipewire
@@ -31,13 +32,13 @@ 
}:

let

  pname = "gamescope";

  version = "3.11.52-beta6";

  version = "3.12.0-beta9";



  vkroots = fetchFromGitHub {

    owner = "Joshua-Ashton";

    repo = "vkroots";

    rev = "26757103dde8133bab432d172b8841df6bb48155";

    sha256 = "sha256-eet+FMRO2aBQJcCPOKNKGuQv5oDIrgdVPRO00c5gkL0=";

    hash = "sha256-eet+FMRO2aBQJcCPOKNKGuQv5oDIrgdVPRO00c5gkL0=";

  };

in

stdenv.mkDerivation {
@@ -47,36 +48,11 @@ stdenv.mkDerivation { 
    owner = "ValveSoftware";

    repo = "gamescope";

    rev = "refs/tags/${version}";

    hash = "sha256-2gn6VQfmwwl86mmnRh+J1uxSIpA5x/Papq578seJ3n8=";

    hash = "sha256-nPFHMRp3uq2CIxY3EdaoTltqyb5z0kFwXw5U9ajbrfo=";

  };



  patches = [

    ./use-pkgconfig.patch



    # https://github.com/Plagman/gamescope/pull/811

    (fetchpatch {

      name = "fix-openvr-dependency-name.patch";

      url = "https://github.com/Plagman/gamescope/commit/557e56badec7d4c56263d3463ca9cdb195e368d7.patch";

      sha256 = "sha256-9Y1tJ24EsdtZEOCEA30+FJBrdzXX+Nj3nTb5kgcPfBE=";

    })

    # https://github.com/Plagman/gamescope/pull/813

    (fetchpatch {

      name = "fix-openvr-include.patch";

      url = "https://github.com/Plagman/gamescope/commit/1331b9f81ea4b3ae692a832ed85a464c3fd4c5e9.patch";

      sha256 = "sha256-wDtFpM/nMcqSbIpR7K5Tyf0845r3l4kQHfwll1VL4Mc=";

    })

    # https://github.com/Plagman/gamescope/pull/812

    (fetchpatch {

      name = "bump-libdisplay-info-maximum-version.patch";

      url = "https://github.com/Plagman/gamescope/commit/b430c5b9a05951755051fd4e41ce20496705fbbc.patch";

      sha256 = "sha256-YHtwudMUHiE8i3ZbiC9gkSjrlS0/7ydjmJsY1a8ZI2E=";

    })

    # https://github.com/Plagman/gamescope/pull/824

    (fetchpatch {

      name = "update-libdisplay-info-pkgconfig-filename.patch";

      url = "https://github.com/Plagman/gamescope/commit/5a672f09aa07c7c5d674789f3c685c8173e7a2cf.patch";

      sha256 = "sha256-7NX54WIsJDvZT3C58N2FQasV9PJyKkJrLGYS1r4f+kc=";

    })

  ];



  nativeBuildInputs = [
@@ -109,6 +85,8 @@ stdenv.mkDerivation { 
    seatd

    libinput

    libxkbcommon

    glm

    gbenchmark

    udev

    pixman

    pipewire