Skip to content

SDL_compat: revert breaking upstream change#460292

Merged
rhendric merged 1 commit intoNixOS:masterfrom
marcin-serwin:push-xzwwxmvzvvzu
Nov 10, 2025
Merged

SDL_compat: revert breaking upstream change#460292
rhendric merged 1 commit intoNixOS:masterfrom
marcin-serwin:push-xzwwxmvzvvzu

Conversation

@marcin-serwin
Copy link
Contributor

@marcin-serwin marcin-serwin commented Nov 10, 2025

Fixes several of the build failures that were caused by #457112, e.g.:

ZHF: #457852

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@marcin-serwin
SDL_compat: revert breaking upstream change
22db7a7 
Fixes several of the build failures that were caused by
<NixOS#457112>, e.g.:

* https://hydra.nixos.org/build/311791969
* https://hydra.nixos.org/build/311791578
* https://hydra.nixos.org/build/311802072

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. labels Nov 10, 2025
@LordGrimmauld LordGrimmauld added 0.kind: regression Something that worked before working no longer 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign labels Nov 10, 2025
@rhendric rhendric added this pull request to the merge queue Nov 10, 2025
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". labels Nov 10, 2025
Merged via the queue into NixOS:master with commit 89b49f4 Nov 10, 2025
35 of 37 checks passed
@grimmauld-bot
Copy link

grimmauld-bot commented Nov 10, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 460292 --skip-package-regex dwarf-fortress.*
Commit: 22db7a73e4b4145220408222869031df11c5b768

x86_64-linux

❌ 9 packages failed to build:
  • frozen-bubble
  • frozen-bubble.devdoc
  • odamex
  • perl538Packages.SDL
  • perl538Packages.SDL.devdoc
  • perlPackages.SDL (perl540Packages.SDL)
  • perlPackages.SDL.devdoc (perl540Packages.SDL.devdoc)
  • soundtracker
  • vessel
✅ 181 packages built:
  • SDL (SDL_compat)
  • SDL_Pango
  • SDL_gfx
  • SDL_image
  • SDL_image.dev
  • SDL_mixer
  • SDL_mixer.dev
  • SDL_net
  • SDL_sound
  • SDL_stretch
  • SDL_ttf
  • agg
  • airstrike
  • andyetitmoves
  • armagetronad
  • asap
  • asap.dev
  • asc
  • atari800
  • ataripp
  • azimuth
  • ballerburg
  • barrage
  • blackvoxel
  • bloodspilot-client
  • bottles
  • btanks
  • caprice32
  • cgterm
  • cheesecutter
  • chickenPackages_5.chickenEggs.sdl-base
  • crrcsim
  • curseofwar-sdl
  • cuyo
  • desmume
  • dgen-sdl
  • directfb
  • dosbox
  • egoboo
  • fim
  • fish-fillets-ng
  • freedroid
  • freedroidrpg
  • freewheeling
  • fuse-emulator
  • gav
  • gl117
  • globulation2
  • gltron
  • gmu
  • gnss-sdr
  • gnu-smalltalk
  • gnujump
  • gnuradio
  • gnuradioMinimal
  • gnuradioPackages.bladeRF
  • gnuradioPackages.fosphor
  • gnuradioPackages.lora_sdr
  • gnuradioPackages.lora_sdr.dev
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • goattracker
  • goattracker-stereo
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • grafx2
  • grafx2.man
  • gravit
  • hase
  • haskellPackages.SDL
  • haskellPackages.SDL-gfx
  • haskellPackages.SDL-gfx.data
  • haskellPackages.SDL-gfx.doc
  • haskellPackages.SDL-image
  • haskellPackages.SDL-image.data
  • haskellPackages.SDL-image.doc
  • haskellPackages.SDL-mixer
  • haskellPackages.SDL-mixer.data
  • haskellPackages.SDL-mixer.doc
  • haskellPackages.SDL-mpeg
  • haskellPackages.SDL-mpeg.data
  • haskellPackages.SDL-mpeg.doc
  • haskellPackages.SDL-ttf
  • haskellPackages.SDL-ttf.data
  • haskellPackages.SDL-ttf.doc
  • haskellPackages.SDL.data
  • haskellPackages.SDL.doc
  • haskellPackages.elerea-sdl
  • haskellPackages.elerea-sdl.doc
  • hex-a-hop
  • hheretic
  • hhexen
  • hivelytracker
  • hyperrogue
  • inspectrum
  • jack_oscrolloscope
  • katawa-shoujo
  • keen4
  • kobodeluxe
  • lbreakout2
  • libagar
  • libagar.devdoc
  • libagar_test
  • libnsfb
  • liquidwar
  • lmms
  • lutris
  • lutris-free
  • matrix-brandy
  • meritous
  • meterbridge
  • mjpegtoolsFull
  • mjpegtoolsFull.lib
  • netsurf-browser
  • nexuiz
  • njam
  • onscripter
  • open-watcom-v2
  • open-watcom-v2-unwrapped
  • openboard
  • openlierox
  • opentx
  • openxcom
  • perl538Packages.AlienSDL
  • perl538Packages.AlienSDL.devdoc
  • perlPackages.AlienSDL (perl540Packages.AlienSDL)
  • perlPackages.AlienSDL.devdoc (perl540Packages.AlienSDL.devdoc)
  • plib
  • pokerth
  • pokerth-server
  • powermanga
  • pterm
  • qodem
  • qradiolink
  • quakespasm
  • quantumminigolf
  • rili
  • rott
  • rott-shareware
  • rrootage
  • scorched3d
  • sfxr
  • sfxr-qt
  • simgear
  • simutrans_binaries
  • smpeg
  • smpeg.dev
  • soi
  • sparrow3d
  • sparrow3d.dev
  • stardust
  • synaesthesia
  • t4kcommon
  • tecnoballz
  • teetertorture
  • tiny8086
  • tinyemu
  • titanion
  • torus-trooper
  • trunk-recorder
  • tumiki-fighters
  • tuxtype
  • uhexen2
  • ultimatestunts
  • unscii
  • unscii.extra
  • urbanterror
  • vice
  • vix
  • vp
  • vp.man
  • xpilot-ng
  • xwax
  • zandronum
  • zandronum-server
  • zatackax
  • zaz
  • zod
  • zsnes
  • zsnes2
Error logs: `x86_64-linux`
odamex 
   68 |   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
      |          ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   69 |                                    __glibc_objsize (__s), __fmt,
      |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   70 |                                    __va_arg_pack ());
      |                                    ~~~~~~~~~~~~~~~~~
[ 35%] Building CXX object server/CMakeFiles/odasrv.dir/__/common/i_net.cpp.o
/build/odamex-src-0.9.5/common/i_net.cpp:96:10: fatal error: miniwget.h: No such file or directory
   96 | #include "miniwget.h"
      |          ^~~~~~~~~~~~
compilation terminated.
make[2]: *** [server/CMakeFiles/odasrv.dir/build.make:471: server/CMakeFiles/odasrv.dir/__/common/i_net.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:276: server/CMakeFiles/odasrv.dir/all] Error 2
In file included from /build/odamex-src-0.9.5/odalaunch/src/query_thread.cpp:32:
/build/odamex-src-0.9.5/odalaunch/src/oda_defs.h:83:20: warning: 'def_masterlist' defined but not used [8;;https://gcc.gnu.org/onlinedocs/gcc-14.3.0/gcc/Warning-Options.html#index-Wno-unused-variable�-Wunused-variable8;;�]
   83 | static const char* def_masterlist[] =
      |                    ^~~~~~~~~~~~~~
[ 36%] Linking CXX executable odalaunch
[ 36%] Built target odalaunch
make: *** [Makefile:156: all] Error 2
perl538Packages.SDL 
t/sdlx_sprite_animated.t      (Wstat: 139 (Signal: SEGV, dumped core) Tests: 20 Failed: 0)
  Non-zero wait status: 139
  Parse errors: No plan found in TAP output
t/sdlx_surface.t              (Wstat: 139 (Signal: SEGV, dumped core) Tests: 0 Failed: 0)
  Non-zero wait status: 139
  Parse errors: No plan found in TAP output
t/sdlx_text.t                 (Wstat: 139 (Signal: SEGV, dumped core) Tests: 13 Failed: 0)
  Non-zero wait status: 139
t/sdlx_validate.t             (Wstat: 139 (Signal: SEGV, dumped core) Tests: 9 Failed: 0)
  Non-zero wait status: 139
  Parse errors: No plan found in TAP output
t/smpeg.t                     (Wstat: 139 (Signal: SEGV, dumped core) Tests: 0 Failed: 0)
  Non-zero wait status: 139
t/ttf.t                       (Wstat: 139 (Signal: SEGV, dumped core) Tests: 65 Failed: 0)
  Non-zero wait status: 139
t/ttf_font.t                  (Wstat: 139 (Signal: SEGV, dumped core) Tests: 6 Failed: 0)
  Non-zero wait status: 139
Files=58, Tests=3146, 147 wallclock secs ( 0.29 usr  0.12 sys + 74.51 cusr  6.49 csys = 81.41 CPU)
Result: FAIL
Failed 54/58 test programs. 1/3146 subtests failed.
perlPackages.SDL 
t/sdlx_sprite_animated.t      (Wstat: 139 (Signal: SEGV, dumped core) Tests: 20 Failed: 0)
  Non-zero wait status: 139
  Parse errors: No plan found in TAP output
t/sdlx_surface.t              (Wstat: 139 (Signal: SEGV, dumped core) Tests: 0 Failed: 0)
  Non-zero wait status: 139
  Parse errors: No plan found in TAP output
t/sdlx_text.t                 (Wstat: 139 (Signal: SEGV, dumped core) Tests: 13 Failed: 0)
  Non-zero wait status: 139
t/sdlx_validate.t             (Wstat: 139 (Signal: SEGV, dumped core) Tests: 9 Failed: 0)
  Non-zero wait status: 139
  Parse errors: No plan found in TAP output
t/smpeg.t                     (Wstat: 139 (Signal: SEGV, dumped core) Tests: 0 Failed: 0)
  Non-zero wait status: 139
t/ttf.t                       (Wstat: 139 (Signal: SEGV, dumped core) Tests: 65 Failed: 0)
  Non-zero wait status: 139
t/ttf_font.t                  (Wstat: 139 (Signal: SEGV, dumped core) Tests: 6 Failed: 0)
  Non-zero wait status: 139
Files=58, Tests=3146, 147 wallclock secs ( 0.28 usr  0.12 sys + 74.52 cusr  6.49 csys = 81.41 CPU)
Result: FAIL
Failed 54/58 test programs. 1/3146 subtests failed.
soundtracker 
configure.ac:63: warning: macro 'AM_PATH_XML2' not found in library
autoreconf: configure.ac: tracing
autoreconf: configure.ac: not using Libtool
autoreconf: configure.ac: not using Intltool
autoreconf: configure.ac: not using Gtkdoc
autoreconf: running: /nix/store/0vbv3qlfrn930grhv1wc9a9xmwflmjca-autoconf-2.72/bin/autoconf --force
configure.ac:8: warning: 'AM_CONFIG_HEADER': this macro is obsolete.
configure.ac:8: You should use the 'AC_CONFIG_HEADERS' macro instead.
aclocal.m4:1369: AM_CONFIG_HEADER is expanded from...
configure.ac:8: the top level
configure.ac:132: warning: The macro 'AC_HEADER_STDC' is obsolete.
configure.ac:132: You should run autoupdate.
./lib/autoconf/headers.m4:663: AC_HEADER_STDC is expanded from...
configure.ac:132: the top level
configure.ac:336: warning: AC_OUTPUT should be used without arguments.
configure.ac:336: You should run autoupdate.
configure.ac:63: error: possibly undefined macro: AM_PATH_XML2
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.
autoreconf: error: /nix/store/0vbv3qlfrn930grhv1wc9a9xmwflmjca-autoconf-2.72/bin/autoconf failed with exit status: 1

@LordGrimmauld
Copy link
Contributor

LordGrimmauld commented Nov 10, 2025

Doesn't fix all the breaks, but a good chunk. Thank you.

@LordGrimmauld
Copy link
Contributor

LordGrimmauld commented Nov 10, 2025

@LordGrimmauld LordGrimmauld mentioned this pull request Nov 11, 2025
Merged
13 tasks
@marcin-serwin marcin-serwin deleted the push-xzwwxmvzvvzu branch November 21, 2025 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rhendric rhendric rhendric approved these changes

@evysgarden evysgarden Awaiting requested review from evysgarden

@jansol jansol Awaiting requested review from jansol

@LordGrimmauld LordGrimmauld Awaiting requested review from LordGrimmauld

@pbsds pbsds Awaiting requested review from pbsds

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

Assignees

No one assigned

Labels

0.kind: regression Something that worked before working no longer 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@marcin-serwin @grimmauld-bot @LordGrimmauld @rhendric