Skip to content

[Backport release-25.05] gamescope: 3.16.9 -> 3.16.17#448655

Merged
K900 merged 10 commits intoNixOS:release-25.05from
mdaniels5757:backport-441368-to-release-25.05
Oct 5, 2025
Merged

[Backport release-25.05] gamescope: 3.16.9 -> 3.16.17#448655
K900 merged 10 commits intoNixOS:release-25.05from
mdaniels5757:backport-441368-to-release-25.05

Conversation

@mdaniels5757
Copy link
Member

Manual backport of #411521 #413623 #416270 #418066 #429538 #429538 #430181 #433420 #438531 #441368 to release-25.05.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

r-ryantm and others added 5 commits October 4, 2025 18:08
(cherry picked from commit 6ee1ed9)
(cherry picked from commit d00c99a)
(cherry picked from commit 01aff80)
(cherry picked from commit ef05c5d)
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between d655901 and original 207a3e4 may warrant inspection.

Show diff
@@ Commit message
 
     This significantly shrinks the build closure of gamescope-wsi on i686.
 
+    (cherry picked from commit 207a3e468b6e1014711f0b34fddf68d162d81426)
+
  ## pkgs/by-name/ga/gamescope/package.nix ##
 @@ pkgs/by-name/ga/gamescope/package.nix: stdenv.mkDerivation (finalAttrs: {
      pkg-config
@@ pkgs/by-name/ga/gamescope/package.nix: stdenv.mkDerivation (finalAttrs: {
 -    # For `libdisplay-info`
 -    python3
 -    hwdata
--    v4l-utils
+-    edid-decode
 +
      # For OpenVR
      cmake
@@ pkgs/by-name/ga/gamescope/package.nix: stdenv.mkDerivation (finalAttrs: {
 +    # For `libdisplay-info`
 +    python3
 +    hwdata
-+    v4l-utils
++    edid-decode
    ];
  
    buildInputs = [

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

K900 and others added 5 commits October 4, 2025 18:16
This significantly shrinks the build closure of gamescope-wsi on i686.

(cherry picked from commit 207a3e4)
(cherry picked from commit ba71ac2)
Maybe libxcb should be `optionals enableWsi` since the change didn't
break the gamescope package without Wsi, but i found out it also builds
fine if i move libx11 to `optionals enableWsi` so this is something
the gamescope maintainers have to figure out.

(cherry picked from commit 7f40bf7)
(cherry picked from commit 6cf68f7)
@mdaniels5757 mdaniels5757 force-pushed the backport-441368-to-release-25.05 branch from 882cc40 to 71cddc9 Compare October 4, 2025 22:16
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 4.workflow: backport This targets a stable branch labels Oct 4, 2025
@mdaniels5757
Copy link
Member Author

This report is automatically generated by the PR / Check / cherry-pick CI workflow.
...

Yes, I didn't cherry-pick #419046.

@mdaniels5757
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 448655
Commit: 882cc40cf86f2f98752182c5188ea0e05d92922c (subsequent changes)
Merge: 68c8968a58eb8c15318d3abd8f57ecc03d2f8da4

Logs: https://github.com/mdaniels5757/nixpkgs-review-gha/actions/runs/18250196773


x86_64-linux

✅ 5 packages built:
  • bottles
  • bottles-unwrapped
  • gamescope
  • gamescope-wsi
  • opengamepadui

aarch64-linux

✅ 4 packages built:
  • bottles
  • bottles-unwrapped
  • gamescope
  • gamescope-wsi

x86_64-darwin

No rebuilds


aarch64-darwin

No rebuilds

@K900 K900 enabled auto-merge October 5, 2025 07:35
@K900 K900 added this pull request to the merge queue Oct 5, 2025
Merged via the queue into NixOS:release-25.05 with commit 1f15062 Oct 5, 2025
32 of 34 checks passed
@mdaniels5757 mdaniels5757 deleted the backport-441368-to-release-25.05 branch October 5, 2025 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants