Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions pkgs/by-name/sd/SDL2_classic/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
stdenv,
config,
fetchFromGitHub,
fetchpatch,
nix-update-script,
pkg-config,
mesa,
Expand Down Expand Up @@ -71,13 +70,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "SDL2";
version = "2.32.2";
version = "2.32.4";

src = fetchFromGitHub {
owner = "libsdl-org";
repo = "SDL";
rev = "release-${finalAttrs.version}";
hash = "sha256-Gtg8G1tRouGZbes1KhsXpYbItpNHYqJCiQKW/L77b+U=";
hash = "sha256-4yUJkttUAbDC/5IdcCFY5ZTIG1qsxEEOjTTuplXV/p4=";
};
dontDisableStatic = if withStatic then 1 else 0;
outputs = [
Expand All @@ -92,11 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
# but on NixOS they're spread across different paths.
# This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly.
./find-headers.patch
Copy link
Contributor

Choose a reason for hiding this comment

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

you probably only intended to drop the commit that is now included in the release, not the header patch? Otherwise, please also remove the header patch file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Dropped by accident. Restored.

# https://github.com/libsdl-org/SDL/issues/12224
(fetchpatch {
url = "https://github.com/libsdl-org/SDL/commit/9e079fe9c7931738ed63d257b1d7fb8a07b66824.diff";
hash = "sha256-G8gAivCtw5zuPVI9wvEq2oIo/NxFdnPqyLwrmHG1EJ4=";
})
];

postPatch = ''
Expand Down