Skip to content

SDL: Support pkg-config in sdl.m4#195981

Closed
peperunas wants to merge 2 commits intoNixOS:stagingfrom
peperunas:sdl-i686
Closed

SDL: Support pkg-config in sdl.m4#195981
peperunas wants to merge 2 commits intoNixOS:stagingfrom
peperunas:sdl-i686

Conversation

@peperunas
Copy link
Copy Markdown
Contributor

@peperunas peperunas commented Oct 14, 2022 •
edited
Loading

Backport some commits

Description of changes

This issue is part of a series of bugfixes to improve the i686 cross-compilation pipeline.

Tracking issue: #195967

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@peperunas peperunas mentioned this pull request Oct 14, 2022
Open
@ofborg ofborg bot requested a review from lovek323 October 14, 2022 14:11
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Oct 14, 2022
lovesegfault
lovesegfault reviewed Oct 14, 2022
View reviewed changes
pkgs/development/libraries/SDL/default.nix
sha256 = "sha256-fuxXsqZW94/C8CKu9LakppCU4zHupj66O2MngQ4BO9o=";
})
# pkg-config support in in sdl.m4.
# Using unofficial mirror because git import issue:
Copy link
Copy Markdown
Member

@lovesegfault lovesegfault Oct 14, 2022

Choose a reason for hiding this comment

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

What does this mean?

Copy link
Copy Markdown
Contributor Author

@peperunas peperunas Oct 15, 2022

Choose a reason for hiding this comment

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

This patch (https://github.com/spurious/SDL-mirror/commit/c7ec74595965a872d077a0e20377cbdb0c0e694f.patch) adds pkg-config support in sdl.m4.

There's a typo in the comment, that should be "pkg-config support is in sdl.m4".

@peperunas peperunas changed the base branch from master to staging October 15, 2022 15:43
@peperunas peperunas requested review from lovesegfault and removed request for lovek323 October 15, 2022 15:43
@ofborg ofborg bot requested a review from lovek323 October 15, 2022 16:07
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 19, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 10, 2024
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 10, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 1, 2025
@marcin-serwin
Copy link
Copy Markdown
Contributor

marcin-serwin commented Jan 20, 2026

SDL has been replaced with sdl12-compat which comes with pkg-config files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@peperunas @marcin-serwin @lovesegfault @wegank @Ericson2314