From d4b7c2b88f3b121429a08c04cb50dcef48319b8f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 5 Nov 2018 20:30:02 +0100
Subject: vim: add cf-private on darwin

    Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in os_macosx.o
    ld: symbol(s) not found for architecture x86_64
---
 pkgs/applications/editors/vim/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix           | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 26cd61d182bd..2f34a6ddeb6b 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -6,7 +6,7 @@
     sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
   }
 # apple frameworks
-, Carbon, Cocoa
+, cf-private, Carbon, Cocoa
 }:
 
 let
@@ -19,7 +19,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext pkgconfig ];
   buildInputs = [ ncurses ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ];
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+      Carbon Cocoa
+      # Needed for OBJC_CLASS_$_NSArray symbols.
+      cf-private
+    ];
 
   configureFlags = [
     "--enable-multibyte"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db7dd73001d9..fd464eed8efa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19378,6 +19378,7 @@ with pkgs;
   };
 
   vim = callPackage ../applications/editors/vim {
+    inherit (darwin) cf-private;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
-- 
cgit 1.4.1