Merge pull request #224 from Jovian-Experiments/gamescope-3.13.7

Gamescope 3.13.7
Jovian-Experiments · Nov 18, 2023 · 9a1eee0 · 9a1eee0
2 parents 4c9c520 + d3f8137
commit 9a1eee0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/pkgs/gamescope-session/default.nix b/pkgs/gamescope-session/default.nix
@@ -98,13 +98,13 @@ let
   };
 in stdenv.mkDerivation(finalAttrs: {
   pname = "gamescope-session";
-  version = "3.13.5-1";
+  version = "3.13.7-1";
 
   src = fetchFromGitHub {
     owner = "Jovian-Experiments";
     repo = "PKGBUILDs-mirror";
     rev = "jupiter-main/gamescope-${finalAttrs.version}";
-    hash = "sha256-mm+P27wpiu72IH+w7vm12sTKafbSJTkd+2PNipinhuE=";
+    hash = "sha256-WFFvm+w1JbRRMJ49hsZkpe78MoUQMfNHSuB8NDFH9fQ=";
   };
 
   patchPhase = ''

diff --git a/pkgs/gamescope/default.nix b/pkgs/gamescope/default.nix
@@ -9,24 +9,22 @@
 #       version shipped by the vendor, ensuring feature level is equivalent.
 
 let
-  version = "3.13.5";
-  hash = "sha256-ITpUHE8VQKZOaCGHBdh0d40J5ejdG/ahv4V3o0KKMh4=";
-
   joshShaders = fetchFromGitHub {
     owner = "Joshua-Ashton";
     repo = "GamescopeShaders";
     rev = "v0.1";
     hash = "sha256-gR1AeAHV/Kn4ntiEDUSPxASLMFusV6hgSGrTbMCBUZA=";
   };
 in
-gamescope'.overrideAttrs({ buildInputs, postPatch ? "", postInstall ? "", ... }: {
-  name = "gamescope-${version}";
+gamescope'.overrideAttrs(old: rec {
+  version = "3.13.7";
+
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    inherit hash;
+    hash = "sha256-Q9pUU0L9d5nAQDgsMqFx2oj38chouRLk2tFGiRqvp/k=";
   };
 
   # Clobber unvendoring vkroots, nixpkgs version is too old
@@ -47,12 +45,12 @@ gamescope'.overrideAttrs({ buildInputs, postPatch ? "", postInstall ? "", ... }:
     substituteInPlace src/reshade_effect_manager.cpp --replace "@out@" "$out"
   '';
 
-  buildInputs = buildInputs ++ [
+  buildInputs = old.buildInputs ++ [
     gbenchmark
     glm
   ];
 
-  postInstall = postInstall + ''
+  postInstall = old.postInstall + ''
     mkdir -p $out/share/gamescope/reshade
 	  cp -r ${joshShaders}/* $out/share/gamescope/reshade/
   '';