From 388a868d6db2e5fb7dac0cf7a7c22265262e32f3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 7 Nov 2018 19:54:16 +0100
Subject: [PATCH] glfw: add cf-private on darwin

    Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          __glfwPlatformPollEvents in cocoa_window.m.o
          __glfwPlatformWaitEvents in cocoa_window.m.o
          __glfwPlatformWaitEventsTimeout in cocoa_window.m.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in cocoa_window.m.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in cocoa_window.m.o
    ld: symbol(s) not found for architecture x86_64
---
 pkgs/development/libraries/glfw/3.x.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix         | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 8d4d4d10038..9cbc60dcef5 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
-, darwin, fixDarwinDylibNames
+, cf-private, Cocoa, Kernel, fixDarwinDylibNames
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libX11 libXrandr libXinerama libXcursor
-  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]);
+  ] ++ lib.optionals stdenv.isDarwin [
+    Cocoa Kernel fixDarwinDylibNames
+    # Needed for NSDefaultRunLoopMode symbols.
+    cf-private
+  ];
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84ca9cd8161..0ec669de21e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9731,7 +9731,10 @@ with pkgs;
 
   glfw = glfw3;
   glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
-  glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
+  glfw3 = callPackage ../development/libraries/glfw/3.x.nix {
+    inherit (darwin) cf-private;
+    inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
+  };
 
   glibc = callPackage ../development/libraries/glibc {
     installLocales = config.glibc.locales or false;