Skip to content

sdl2-compat: symlink package config specification file into sdl2.pc#393342

Merged
K900 merged 1 commit intoNixOS:masterfrom
LordGrimmauld:sdl2_compat_prep
Mar 26, 2025
Merged

sdl2-compat: symlink package config specification file into sdl2.pc#393342
K900 merged 1 commit intoNixOS:masterfrom
LordGrimmauld:sdl2_compat_prep

Conversation

@LordGrimmauld
Copy link
Contributor

@LordGrimmauld LordGrimmauld commented Mar 26, 2025

Previously, replacing SDL2 with sdl2-compat with dependents on the SDL2 pkgconfig file would just break. An example for this breakage is pkgs.ffmpeg.override { SDL2 = pkgs.sdl2-compat; }. This is fixed by symlinking the missing sdl2.pc file to point to sdl2_compat.pc.

This is analogous to #388304 (aa8bb53)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@LordGrimmauld LordGrimmauld force-pushed the sdl2_compat_prep branch 2 times, most recently from 0caecb1 to 98b63c0 Compare March 26, 2025 09:35
Previously, replacing SDL2 with sdl2-compat with dependents on the SDL2 pkgconfig file would just break.
An example for this breakage is pkgs.ffmpeg.override { SDL2 = pkgs.sdl2-compat; }.
This is fixed by symlinking the missing sdl2.pc file to point to sdl2_compat.pc.

This is analogous to NixOS#388304 (aa8bb53)
@github-actions github-actions bot added 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. labels Mar 26, 2025
@K900 K900 merged commit 266484b into NixOS:master Mar 26, 2025
23 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants