dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

sylpheed: unbreak on aarch64-darwin

Browse Source
This commit is contained in:
Weijia Wang 2022-12-22 21:38:02 +01:00 committed by Rick van Schijndel
parent 0bc8e25344
commit 4206272a15
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null { 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 gpgSupport -> gpgme != null;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
@ -34,18 +34,20 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2 ] buildInputs = [ gtk2 ]
++ optionals gpgSupport [ gpgme ] ++ optionals gpgSupport [ gpgme ]
++ optionals sslSupport [ openssl ]; ++ optionals sslSupport [ openssl ]
++ optionals stdenv.isDarwin [ Foundation ];
configureFlags = optional gpgSupport "--enable-gpgme" configureFlags = optional gpgSupport "--enable-gpgme"
++ optional sslSupport "--enable-ssl"; ++ optional sslSupport "--enable-ssl";
# Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool"
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation";
meta = { meta = {
homepage = "https://sylpheed.sraoss.jp/en/"; homepage = "https://sylpheed.sraoss.jp/en/";
description = "Lightweight and user-friendly e-mail client"; description = "Lightweight and user-friendly e-mail client";
maintainers = with maintainers; [ eelco ]; maintainers = with maintainers; [ eelco ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2; license = licenses.gpl2;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -32539,7 +32539,9 @@ with pkgs;
boost = boost168; 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 { }; symbolic-preview = callPackage ../applications/graphics/symbolic-preview { };