From 6ee29afee9ced11afcf62af4bd1b2ef872bfd1ef Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 18 Mar 2025 19:10:13 -0400 Subject: [PATCH] smpeg: fix build on Darwin with SDL_compat --- pkgs/by-name/sm/smpeg/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sm/smpeg/package.nix b/pkgs/by-name/sm/smpeg/package.nix index 51adb5e90c791..32dc1cc52de32 100644 --- a/pkgs/by-name/sm/smpeg/package.nix +++ b/pkgs/by-name/sm/smpeg/package.nix @@ -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. @@ -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/";