Skip to content

smpeg: fix build on Darwin with SDL_compat #391118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
K900 merged 1 commit into from
Mar 19, 2025
Merged

smpeg: fix build on Darwin with SDL_compat #391118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions pkgs/by-name/sm/smpeg/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs=";
};

patches = [
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ ./libx11.patch ] ++ [
./format.patch
./gcc6.patch
./libx11.patch
./gtk.patch
# These patches remove use of the `register` storage class specifier,
# allowing smpeg to build with clang 16, which defaults to C++17.
Expand Down Expand Up @@ -93,7 +92,7 @@ stdenv.mkDerivation rec {
--prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig"
'';

NIX_LDFLAGS = "-lX11";
NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lX11";

meta = {
homepage = "https://icculus.org/smpeg/";
Expand Down