From 8cebbcf052985f0e34d95ef773ebed130189abed Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 17 Dec 2024 21:27:37 +0300 Subject: [PATCH 1/2] decky-loader: relax watchdog dependency --- pkgs/decky-loader/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/decky-loader/default.nix b/pkgs/decky-loader/default.nix index 389d574d..0d42e0cb 100644 --- a/pkgs/decky-loader/default.nix +++ b/pkgs/decky-loader/default.nix @@ -58,6 +58,8 @@ python3.pkgs.buildPythonPackage rec { "--prefix PATH : ${lib.makeBinPath [ coreutils psmisc ]}" ]; + pythonRelaxDeps = [ "watchdog" ]; + passthru.python = python3; meta = with lib; { From c9b2e15e954cdbcee91538388452e4d0b6da9724 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 17 Dec 2024 21:27:43 +0300 Subject: [PATCH 2/2] mesa-radeonsi-jupiter: refresh patches for 24.3.1 --- pkgs/mesa-radeonsi-jupiter/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/mesa-radeonsi-jupiter/default.nix b/pkgs/mesa-radeonsi-jupiter/default.nix index 79ffaf2b..1d470333 100644 --- a/pkgs/mesa-radeonsi-jupiter/default.nix +++ b/pkgs/mesa-radeonsi-jupiter/default.nix @@ -1,21 +1,16 @@ { mesa, fetchpatch }: -# Patches from mesa-24.0..radeonsi-24.0.4, minus things merged in Mesa upstream +# Patches from nixpkgs mesa..vendor radeonsi branch mesa.overrideAttrs(old: { patches = old.patches ++ [ - # Cherry-pick the swapchain override bits from the Valve 24.1 branch + # Cherry-pick the swapchain override bits from the Valve 24.3 branch (fetchpatch { - url = "https://github.com/Jovian-Experiments/mesa/commit/d0722142079fdc5dab999aca9456cab6b8a9a214.patch"; - hash = "sha256-oayXr+BjgO47yZM1IXnpykDTNirqZBW75nN/wsRzNGw="; + url = "https://github.com/Jovian-Experiments/mesa/commit/27482ce2030cc4249908382fb4e2092134135fdb.patch"; + hash = "sha256-tQoGN/88sdPDQmscfkPKulPasU2tLeRekWG9xWF/BsQ="; }) # Disable glthread by default (fetchpatch { url = "https://github.com/Jovian-Experiments/mesa/commit/09d9c2fd7f69fbe59aab0bb53438d3446ea90dd4.patch"; hash = "sha256-y0wGWVBQiWd2hOqiqDIKP9VERNSP4owuPGjnqUTNy68="; }) - # Backport HEVC encode fix - (fetchpatch { - url = "https://github.com/Jovian-Experiments/mesa/commit/6c30d44613d5945c0660701a5a59c659a709ca37.patch"; - hash = "sha256-pl1gU6aMUupFAf4vxDffzpyZ3Lz6SzVYeAtLuulLWcU="; - }) ]; })