Merge pull request #372 from Jovian-Experiments/gamescope-3.14.20

Gamescope 3.14.20

overlay.nix

@@ -23,7 +23,7 @@ rec {
 
   gamescope = import ./pkgs/gamescope {
     gamescope' = super.gamescope;
-    inherit (final) fetchFromGitHub;
+    inherit (final) fetchFromGitHub cmake;
   };
   gamescope-wsi = gamescope.override {
     enableExecutable = false;

pkgs/gamescope-session/default.nix

@@ -104,13 +104,13 @@ let
   };
 in stdenv.mkDerivation(finalAttrs: {
   pname = "gamescope-session";
-  version = "3.14.18-2";
+  version = "3.14.19-1";
 
   src = fetchFromGitHub {
     owner = "Jovian-Experiments";
     repo = "PKGBUILDs-mirror";
     rev = "jupiter-main/gamescope-${finalAttrs.version}";
-    hash = "sha256-kyNPcThRxfsG53hQErfBtphdQi4K0Oo9m5aE3DeQtas=";
+    hash = "sha256-e2476xfhJC4tq1AldbwhdYLj0wJmjrJ7iOwMIY2D5W8=";
   };
 
   patches = [

pkgs/gamescope/default.nix

@@ -1,18 +1,23 @@
 { gamescope'
 , fetchFromGitHub
+, cmake
 }:
 
 # NOTE: vendoring gamescope for the time being since we want to match the
 #       version shipped by the vendor, ensuring feature level is equivalent.
 
 gamescope'.overrideAttrs(old: rec {
-  version = "3.14.18";
+  version = "3.14.20";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-XcefR0wiDHQY7wMX+LQTEntffi2RdMW8m2HNQMz035A=";
+    hash = "sha256-kpJUghNbcbXk2V64SkzYq0+aHK62clQGXTn532Nt9ck=";
   };
+
+  # Force vendored OpenVR
+  buildInputs = builtins.filter (p: p.pname != "openvr") old.buildInputs;
+  nativeBuildInputs = old.nativeBuildInputs ++ [ cmake ];
 })