From 7fd359f2f920bb6ffde09e06f6792b6fd7483bd7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 5 Nov 2018 19:57:12 +0100
Subject: pinentry_mac: add cf-private

    Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in GPGDefaults.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in PinentryController.o
          objc-class-ref in GPGDefaults.o
          objc-class-ref in KeychainSupport.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in GPGDefaults.o
      "_OBJC_CLASS_$_NSSet", referenced from:
          objc-class-ref in GPGDefaults.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in GPGDefaults.o
    ld: symbol(s) not found for architecture x86_64
---
 pkgs/tools/security/pinentry/mac.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index 4acdd6cb897e..8168aa94b3d2 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }:
+{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses, cf-private }:
 
 stdenv.mkDerivation rec {
   name = "pinentry-mac-0.9.4";
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ xcbuildHook ];
-  buildInputs = [ libiconv Cocoa ncurses ];
+
+  buildInputs = [
+    libiconv Cocoa ncurses
+    # Needed for OBJC_CLASS_$_NSArray symbols.
+    cf-private
+  ];
 
   installPhase = ''
     mkdir -p $out/Applications
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d36b9a6de93..db7dd73001d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4779,6 +4779,7 @@ with pkgs;
   };
 
   pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
+    inherit (darwin) cf-private;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-- 
cgit 1.4.1