From 4206272a15a70ee7bde64c0467f09d3192412ca4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 22 Dec 2022 21:38:02 +0100 Subject: [PATCH] sylpheed: unbreak on aarch64-darwin --- .../networking/mailreaders/sylpheed/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 3be569082d0a..1e2d5c031d64 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null -, gpgSupport ? true, sslSupport ? true, fetchpatch }: +, gpgSupport ? true, sslSupport ? true, fetchpatch, Foundation }: assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; @@ -34,18 +34,20 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 ] ++ optionals gpgSupport [ gpgme ] - ++ optionals sslSupport [ openssl ]; + ++ optionals sslSupport [ openssl ] + ++ optionals stdenv.isDarwin [ Foundation ]; configureFlags = optional gpgSupport "--enable-gpgme" ++ optional sslSupport "--enable-ssl"; + # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; + meta = { homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c865b3df456c..099654fc5ef4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32539,7 +32539,9 @@ with pkgs; boost = boost168; }; - sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; symbolic-preview = callPackage ../applications/graphics/symbolic-preview { };