From 38d39e6d6e94294cca62bbfc05d5bab36c36a795 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 30 Aug 2024 21:48:43 -0400 Subject: [PATCH] librsvg: link libobjc on Darwin independent of CPU architecture aarch64-darwin now also needs to link libobjc explicitly when using the new Darwin SDKs. --- pkgs/development/libraries/librsvg/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 5024f36ff248..3d7a8bf8e5ba 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -113,11 +113,8 @@ stdenv.mkDerivation (finalAttrs: { ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders ''; - # librsvg only links Foundation, but it also requiers libobjc. The Framework.tbd in the 11.0 SDK - # reexports libobjc, but the one in the 10.12 SDK does not, so link it manually. - env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { - NIX_LDFLAGS = "-lobjc"; - }; + # librsvg only links Foundation, but it also requiers libobjc. + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-lobjc"; }; preConfigure = '' PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)"