[Backport staging-25.05] sdl3: 3.2.14 -> 3.2.16; cleanup dependencies; fix cross compilation#425265
Closed
getchoo wants to merge 11 commits intoNixOS:staging-25.05from
Closed
[Backport staging-25.05] sdl3: 3.2.14 -> 3.2.16; cleanup dependencies; fix cross compilation#425265getchoo wants to merge 11 commits intoNixOS:staging-25.05from
getchoo wants to merge 11 commits intoNixOS:staging-25.05from
Conversation
(cherry picked from commit e01f9b3)
(cherry picked from commit 1771f3a)
Motivation: `ibus` carries lots of dependencies on various versions of gtk. These dependencies become transitive dependencies for sdl3, which causes quite expensive compiles in the sdl3 closure. Particularly, this means gtk (and, in turn, gstreamer and everything else) become part of e.g. ffmpeg. `sdl3` itself uses ibus almost exclusively via dbus, and reimplements some of the most important features. It does depend on ibus only to use some of the constants defined in headers. It does not actually load ibus libraries. This means, as long as the headers are identical, all the gtk dependencies can be removed in the ibus for sdl3. This requires this split. (cherry picked from commit 8b825b2)
`sdl3` only relies on constant definitions in the ibus headers, which does not require ibus to be compiled with gtk support. This means we can shrink the unnecessarily large closure. (cherry picked from commit 2533354)
Release notes: https://github.com/libsdl-org/SDL/releases/tag/release-3.2.16 Diff: libsdl-org/SDL@release-3.2.14...release-3.2.16 Mostly bugfixes, most of which only relevant for windows, xbox or android. Some details about (linux) audio changed, specifically how device leases work. `ffplay` still plays audio just fine, so nothing seems broken. (cherry picked from commit 7219e88)
The `installedTests` contains various test binaries, some of which only useful on a running system. Motivation for providing this output is to eventually test tray support in a VM test, which needs a running dbus session. (cherry picked from commit 73f255a)
(cherry picked from commit d83ebe1)
(cherry picked from commit 9539fbd)
zenity is used not only for error reporting, but also for file dialogs if dbus is disabled/unavailable. This needs a patched path too. (cherry picked from commit 9149a3a)
(cherry picked from commit e3f4f34)
(cherry picked from commit 3a21e96)
getchoo
added
the
6.topic: cross-compilation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
This report is automatically generated by the check-cherry-picks CI workflow.
Some of the commits in this PR have not been cherry-picked exactly and require the author's and reviewer's attention.
Please make sure to follow the backporting guidelines and cherry-pick with the -x flag. This requires changes to go to the unstable branches (master / staging) first, before backporting them.
Occasionally, it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts while cherry-picking or when updating minor versions of packages which have already advanced to the next major on unstable. If you need to merge this PR despite the warnings, please dismiss this review.
Warning
Difference between 47a3fba and original 1771f3a may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
ibus: modernize
+ (cherry picked from commit 1771f3a821490c2e0ded1bfff948b591c18ed7e6)
+
## pkgs/tools/inputmethods/ibus/default.nix ##
@@
buildPackages,
@@ pkgs/tools/inputmethods/ibus/default.nix: let
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "ibus";
- version = "1.5.32";
+ version = "1.5.31";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus";
-- tag = version;
+- rev = version;
+- sha256 = "sha256-YMCtLIK/9iUdS37Oiow7WMhFFPKhomNXvzWbLzlUkdQ=";
+ tag = finalAttrs.version;
- hash = "sha256-Rp2Aw2C2LXMBp8++pnZtPHiPoFDERpkDsKd0E//twuY=";
++ hash = "sha256-YMCtLIK/9iUdS37Oiow7WMhFFPKhomNXvzWbLzlUkdQ=";
};
+ patches = [
@@ pkgs/tools/inputmethods/ibus/default.nix: stdenv.mkDerivation rec {
];
Warning
Difference between 6bd3319 and original 8b825b2 may warrant inspection.
Show diff
@@ Commit message
This means, as long as the headers are identical, all the gtk dependencies
can be removed in the ibus for sdl3. This requires this split.
+ (cherry picked from commit 8b825b220a969c42a4d6e00927e8022c49dd7640)
+
## pkgs/by-name/ib/ibusMinimal/package.nix (new) ##
@@
+{ ibus }: ibus.override { libOnly = true; }
@@ pkgs/tools/inputmethods/ibus/default.nix
+ withWayland ? !libOnly,
libxkbcommon,
wayland,
- wayland-protocols,
+ buildPackages,
@@
nixosTests,
versionCheckHook,
@@ pkgs/tools/inputmethods/ibus/default.nix: stdenv.mkDerivation (finalAttrs: {
"test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus"
];
@@ pkgs/tools/inputmethods/ibus/default.nix: stdenv.mkDerivation (finalAttrs: {
- makeWrapper
- pkg-config
- python3BuildEnv
-- vala
-- wrapGAppsHook3
- dbus-launch
+ pkg-config
+ ];
+
+- nativeBuildInputs = [
+- autoreconfHook
+- gtk-doc
+- gettext
+- makeWrapper
+- pkg-config
+- python3BuildEnv
+- vala
+- wrapGAppsHook3
+- dbus-launch
+- gobject-introspection
+- ];
++ nativeBuildInputs =
++ [
++ autoreconfHook
++ gtk-doc
++ gettext
++ makeWrapper
++ pkg-config
++ python3BuildEnv
++ dbus-launch
+ glib # required to satisfy AM_PATH_GLIB_2_0
+ vala
- gobject-introspection
- ]
++ gobject-introspection
++ ]
+ ++ lib.optionals (!libOnly) [
+ wrapGAppsHook3
-+ ]
- ++ lib.optionals withWayland [
- wayland-scanner
- ];
++ ];
+
+ propagatedBuildInputs = [
+ glib
@@ pkgs/tools/inputmethods/ibus/default.nix: stdenv.mkDerivation (finalAttrs: {
dbus
systemdHint: The full diffs are also available in the runner logs with slightly better highlighting.
nix-owners
bot
requested review from
evysgarden,
jansol,
marcin-serwin and
pbsds
nixpkgs-ci
bot
added
10.rebuild-linux: 501+
marcin-serwin
approved these changes
Jul 15, 2025
nixpkgs-ci
bot
added
12.approvals: 1
pbsds
approved these changes
Jul 15, 2025
nixpkgs-ci
bot
added
12.approvals: 2
Contributor
|
Hm, seems there are merge conflicts now? |
nixpkgs-ci
bot
added
the
2.status: merge conflict
Member
|
It's mass reformatting again. |
13 tasks
Member
|
please rebase, the bump commit may likely now be dropped. I have access to a darwin builder again so I can test and merge now. :) |
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This brings an update and some nice cross-related improvements from the following PRs:
#408880
#413222
#414169
#414472 (partial)
#418644
#418646
Built
sdl3.passthru.testsagainst release-25.05Thanks to @LordGrimmauld for most of these patches. CC @NixOS/sdl
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.