enricobuehler
818531a26e
Two new patches on the pinned upstream, and the marker patch moves last so the banner is stamped after the capabilities it advertises. 0003 — headless: advertise the virtual display's mode and refresh rates. A headless gamescope is how we give a game a display: we pass the client's exact mode and the session runs at it. It never told anyone. CHeadlessConnector returned empty spans from GetModes() and GetValidDynamicRefreshRates() and reported GAMESCOPE_SCREEN_TYPE_INTERNAL, so update_mode_atoms DELETED the mode-list atom (no resolution list) and wlserver fell through to a one-entry refresh list built from g_nOutputRefresh (no refresh list). With --nested-refresh absent that entry is Init()'s 60 Hz default — which is why a field report on a 1920x1080@120 client saw "gamescope only shows 60hz, and there's no other option", and why Overwatch capped itself to 60 while the stream ran at 120. Populate both from the resolved mode, report EXTERNAL, and add --custom-refresh-rates so the offered set can be widened. gamescope-session-plus has probed for that flag for years; upstream never had it, so the CUSTOM_REFRESH_RATES env it plumbs was a no-op everywhere. 0004 — pipewire: optionally composite the external overlay into the capture stream. That layer is mangoapp: the fps/frametime readout the Deck UI turns on. paint_pipewire has never referenced it on any version, so a consumer whose only view of the session is the node sees the overlay it just enabled not appear, with nothing to configure. Behind --pipewire-composite-external-overlay, off by default, same argument as the cursor flag. Its commit id joins the repaint test — the numbers change while the picture behind them is static, exactly the case the existing test skips. Verified: the series git-am's cleanly onto the pinned 8c676c39, and both new functions were extracted verbatim and compiled with -Wall -Wextra under C++23 against stubs, with unit assertions for the parser and the mode/rate publication (sorting, dedup, the running rate always present, re-entrancy, zero rejected). A full gamescope build was not run — no box here has its dependency set; CI's per-Fedora-major leg is the first real compile.
100 lines
5.2 KiB
Nix
100 lines
5.2 KiB
Nix
# `punktfunk-gamescope` — nixpkgs' gamescope carrying punktfunk's `pipewire-hdr` patches, exposed
|
|
# under its own name so it sits BESIDE the system gamescope instead of replacing it.
|
|
#
|
|
# An override rather than a from-scratch derivation on purpose: gamescope vendors wlroots,
|
|
# vkroots, libliftoff, libdisplay-info, SPIRV-Headers and reshade as git submodules plus two meson
|
|
# wraps, and nixpkgs already solves all of that. What we add is the patch set and a rename.
|
|
#
|
|
# This is also why the override needs none of the `force_fallback_for` armour
|
|
# `build-punktfunk-gamescope.sh` carries: that exists because meson silently prefers a SYSTEM
|
|
# wlroots when the build host has one and links it shared, producing a binary that starts only on
|
|
# machines with that dev library. A nix closure names every library it links, so the outcome is
|
|
# whatever nixpkgs' own gamescope already does — reproducibly.
|
|
#
|
|
# `gamescope` in nixpkgs is a wrapper (it wires the WSI layer + capabilities); the buildable
|
|
# derivation is `gamescope.unwrapped` — patching the wrapper would be a no-op, so this asserts on
|
|
# it rather than silently shipping an unpatched binary.
|
|
#
|
|
# Version drift: the patches are applied to whatever gamescope your nixpkgs pins, NOT to the
|
|
# commit `packaging/gamescope/build-punktfunk-gamescope.sh` names. Both hunks sit in code that has
|
|
# been stable across the 3.16 series (`src/pipewire.cpp`'s format builders, `paint_pipewire()` in
|
|
# `src/steamcompmgr.cpp`), so this normally just works — and when it does not, the build fails
|
|
# loudly at `patchPhase` rather than producing a gamescope that quietly cannot do HDR.
|
|
{
|
|
lib,
|
|
gamescope,
|
|
patchDir,
|
|
}:
|
|
let
|
|
# As of nixos-unstable (checked 2026-07-28) `gamescope` IS the buildable derivation — pname
|
|
# "gamescope", version 3.16.25, carrying `src`/`patches`/`mesonFlags`. Revisions that wrap it
|
|
# (to wire the WSI layer + capabilities) expose the build as `.unwrapped`, so prefer that where
|
|
# it exists and take `gamescope` itself otherwise.
|
|
#
|
|
# The check is on the RESULT, not on which attribute we found: `overrideAttrs` on a symlinkJoin
|
|
# wrapper succeeds and does nothing, which would hand us an UNPATCHED gamescope installed under
|
|
# our own name — the single worst outcome here, because the host reads the name as a promise of
|
|
# HDR. (`installCheckPhase` below greps for the marker as the second line of defence; this one
|
|
# fails at eval, before anything is built.)
|
|
base = gamescope.unwrapped or gamescope;
|
|
unwrapped =
|
|
if base ? src then
|
|
base
|
|
else
|
|
throw ''
|
|
punktfunk-gamescope needs a buildable gamescope derivation (one with a `src` that
|
|
`overrideAttrs` can patch); this nixpkgs' `gamescope` is neither that nor a wrapper
|
|
exposing `.unwrapped`. Update nixpkgs, or build the compositor with
|
|
packaging/gamescope/build-punktfunk-gamescope.sh instead.
|
|
'';
|
|
in
|
|
unwrapped.overrideAttrs (old: {
|
|
pname = "punktfunk-gamescope";
|
|
|
|
# Read the patch DIRECTORY rather than naming files: `builtins.attrNames` sorts
|
|
# lexicographically, which for `000N-` prefixes is exactly the apply order, and a patch added or
|
|
# renamed upstream of this file can no longer leave nix silently building a subset. (That already
|
|
# happened once — this list still named the level-1 banner patch after level 2 landed, so a nix
|
|
# build would have shipped a binary with no cursor patch and a marker claiming otherwise.)
|
|
patches =
|
|
(old.patches or [ ])
|
|
++ map (f: "${patchDir}/${f}") (
|
|
builtins.filter (lib.hasSuffix ".patch") (builtins.attrNames (builtins.readDir patchDir))
|
|
);
|
|
|
|
# nixpkgs builds from a `fetchFromGitHub` src, so there is no `.git` for `git describe` and the
|
|
# banner would read `+pfhdrN (gcc …)` with no version at all — which the host's diagnostic
|
|
# version gate then misreads (it takes the first X.Y.Z triple it finds, i.e. the compiler's).
|
|
# Substituting the real version in keeps `--version` honest AND keeps our marker.
|
|
postPatch = (old.postPatch or "") + ''
|
|
substituteInPlace src/meson.build \
|
|
--replace-fail \
|
|
"vcs_tag = run_command(vcs_tag_cmd, check: false).stdout().strip()" \
|
|
"vcs_tag = '${old.version}'"
|
|
'';
|
|
|
|
# Ship ONLY the compositor, renamed. Everything else nixpkgs installs (gamescopectl,
|
|
# gamescopereaper, gamescopestream, the WSI layer, .desktop files) belongs to the real gamescope
|
|
# package — duplicating it here would put two of each on PATH. The host only execs the
|
|
# compositor.
|
|
postInstall = (old.postInstall or "") + ''
|
|
find $out -mindepth 1 -maxdepth 1 ! -name bin -exec rm -rf {} +
|
|
find $out/bin -mindepth 1 ! -name gamescope -delete
|
|
mv $out/bin/gamescope $out/bin/punktfunk-gamescope
|
|
'';
|
|
|
|
# `gamescope --version` exits non-zero on some builds; the grep is the real assertion.
|
|
doInstallCheck = true;
|
|
installCheckPhase = ''
|
|
runHook preInstallCheck
|
|
$out/bin/punktfunk-gamescope --version 2>&1 | grep -q '+pfhdr' \
|
|
|| { echo "punktfunk-gamescope: the +pfhdr marker is missing — the patches did not take"; exit 1; }
|
|
runHook postInstallCheck
|
|
'';
|
|
|
|
meta = (old.meta or { }) // {
|
|
description = "gamescope with 10-bit BT.2020/PQ PipeWire capture, for punktfunk HDR streaming";
|
|
mainProgram = "punktfunk-gamescope";
|
|
};
|
|
})
|