Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE] Changes for staging-next #455

Draft
wants to merge 2 commits into
base: development
Choose a base branch
from
+6 −9
Draft

[DO NOT MERGE] Changes for staging-next #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cebbcf
decky-loader: relax watchdog dependency
K900 Dec 17, 2024
c9b2e15
mesa-radeonsi-jupiter: refresh patches for 24.3.1
K900 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/decky-loader/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ python3.pkgs.buildPythonPackage rec {
"--prefix PATH : ${lib.makeBinPath [ coreutils psmisc ]}"
];

pythonRelaxDeps = [ "watchdog" ];

passthru.python = python3;

meta = with lib; {
Expand Down
13 changes: 4 additions & 9 deletions pkgs/mesa-radeonsi-jupiter/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=";
})
];
})
Loading