diff --git a/flake.lock b/flake.lock index 425028e3..561a6552 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1718714799, + "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "type": "github" }, "original": { diff --git a/overlay.nix b/overlay.nix index 8652426f..bf2858ee 100644 --- a/overlay.nix +++ b/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; diff --git a/pkgs/gamescope-session/default.nix b/pkgs/gamescope-session/default.nix index 5564be11..627ad1a8 100644 --- a/pkgs/gamescope-session/default.nix +++ b/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 = [ diff --git a/pkgs/gamescope/default.nix b/pkgs/gamescope/default.nix index 53286ab5..31252c0e 100644 --- a/pkgs/gamescope/default.nix +++ b/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 ]; })