From 7ec5a430456da600304c182b2b764a23e1e58cbe Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 22 May 2022 10:32:58 +0200 Subject: [PATCH] gamescope: 3.8.4 -> 3.10.30 --- gamescope.nix | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/gamescope.nix b/gamescope.nix index 91db0aa..34cd6cd 100644 --- a/gamescope.nix +++ b/gamescope.nix @@ -1,35 +1,32 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, meson, ninja, wlroots, pkg-config, cmake, xorg, libdrm, -vulkan-loader, wayland, wayland-protocols, libxkbcommon, libcap, SDL2, glslang, libudev, pixman, libinput, }: +{ stdenv, lib, fetchFromGitHub, meson, pkg-config, xorg, libdrm, pipewire +, vulkan-loader, wayland, wayland-protocols, libxkbcommon, libcap, SDL2, glslang, udev, pixman, libinput +, stb, mesa, libseat, xwayland, ninja }: stdenv.mkDerivation rec { pname = "gamescope"; - version = "3.8.4"; + version = "3.11.30"; src = fetchFromGitHub { owner = "Plagman"; repo = pname; rev = version; - sha256 = "1asgyxm05wqmcrvl9i50zx7yrg8ipw6pb5j0bzz31gn589rysgix"; + sha256 = "sha256-dSQrOlQfUZkA8Vrc/Tj9dAWIIBOeb+tAen21fZe3Gto="; fetchSubmodules = true; }; nativeBuildInputs = [ meson - ninja pkg-config - cmake + ninja ]; + buildInputs = [ - (pkgs.callPackage (pkgs.fetchurl { - name = "wlroots_13.nix"; - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/c4976f356529978031f1ad2200015ad03de50cb9/pkgs/development/libraries/wlroots/default.nix"; - sha256 = "49f053124e9029a6863582940af9fefc5e3012353a6b86a2e2214dc7cf6467da"; - }) {}) libdrm - libxkbcommon + pipewire vulkan-loader wayland wayland-protocols + libxkbcommon xorg.libX11 xorg.libXdamage xorg.libXcomposite @@ -39,12 +36,23 @@ vulkan-loader, wayland, wayland-protocols, libxkbcommon, libcap, SDL2, glslang, xorg.libXtst xorg.libXres xorg.libXi + xorg.xcbutilwm + xorg.xcbutilerrors libcap SDL2 glslang - libudev + udev pixman libinput + mesa # libgbm + libseat + xwayland ]; + + preConfigure = '' + # Use packaged stb. + cp -R --no-preserve=mode,ownership ${stb}/include/stb subprojects/stb + cp subprojects/packagefiles/stb/* subprojects/stb + ''; }